From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 26 Aug 2020 22:43:25 +0000 (-0500)
Subject: Move arg for images to the list so we can reuse these fifo functions for videos
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=697bea04731614bcd2e1e10f0564863dc49a49fa;p=akkoma

Move arg for images to the list so we can reuse these fifo functions for videos
---

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)