aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-08-27 13:10:40 -0500
committerMark Felder <feld@FreeBSD.org>2020-08-27 13:10:40 -0500
commitdd1de994d57e3d9c99bb4e4c7019c696b5153f50 (patch)
tree2e7e027837bd747772409762714e694027445743
parentf1218a2b4e16178c8c1285157f7cd995dc950e3e (diff)
downloadpleroma-dd1de994d57e3d9c99bb4e4c7019c696b5153f50.tar.gz
Try to trick ffmpeg into working with this named pipe
-rw-r--r--lib/pleroma/helpers/media_helper.ex3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/helpers/media_helper.ex b/lib/pleroma/helpers/media_helper.ex
index 7c2bfbc53..385a4df81 100644
--- a/lib/pleroma/helpers/media_helper.ex
+++ b/lib/pleroma/helpers/media_helper.ex
@@ -43,11 +43,12 @@ defmodule Pleroma.Helpers.MediaHelper do
{:ok, env} <- Pleroma.HTTP.get(url),
{:ok, fifo_path} <- mkfifo(),
args = [
+ "-y",
"-i", fifo_path,
"-vframes", "1",
"-f", "mjpeg",
"-loglevel", "error",
- "-"
+ "pipe:"
] do
run_fifo(fifo_path, env, executable, args)
else