aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-08-26 17:43:25 -0500
committerMark Felder <feld@FreeBSD.org>2020-08-26 17:43:25 -0500
commit697bea04731614bcd2e1e10f0564863dc49a49fa (patch)
treea571950e4b75631ef8ac9c4b690122a51fc7927e
parent9567b96c7927be433eac4f023051adc5cbd6610c (diff)
downloadpleroma-697bea04731614bcd2e1e10f0564863dc49a49fa.tar.gz
Move arg for images to the list so we can reuse these fifo functions for videos
-rw-r--r--lib/pleroma/helpers/media_helper.ex5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/helpers/media_helper.ex b/lib/pleroma/helpers/media_helper.ex
index fe11dd460..0299b16ae 100644
--- a/lib/pleroma/helpers/media_helper.ex
+++ b/lib/pleroma/helpers/media_helper.ex
@@ -29,7 +29,8 @@ defmodule Pleroma.Helpers.MediaHelper do
args = [
"-interlace", "Plane",
"-resize", resize,
- "-quality", to_string(quality)
+ "-quality", to_string(quality),
+ "jpg:-"
]
{:ok, args}
end
@@ -37,7 +38,7 @@ defmodule Pleroma.Helpers.MediaHelper do
defp prepare_image_resize_args(_), do: {:error, :missing_options}
defp run_fifo(fifo_path, env, executable, args) do
- args = List.flatten([fifo_path, args, "jpg:-"])
+ args = List.flatten([fifo_path, args])
pid = Port.open({:spawn_executable, executable}, [:use_stdio, :stream, :exit_status, :binary, args: args])
fifo = Port.open(to_charlist(fifo_path), [:eof, :binary, :stream, :out])
true = Port.command(fifo, env.body)