diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-21 21:47:32 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-21 21:47:32 +0300 |
| commit | 3a1e810aaaea3e44c4dfc82a014485cf886d6b88 (patch) | |
| tree | e64d36fc037177366ef12ebd76002f3eec84c717 /lib/pleroma/helpers | |
| parent | 610343edb318654126d9539775ba4b9ff30c8831 (diff) | |
| download | pleroma-3a1e810aaaea3e44c4dfc82a014485cf886d6b88.tar.gz | |
[#2497] Customized `exexec` launch to support root operation (currently required by Gitlab CI).
Diffstat (limited to 'lib/pleroma/helpers')
| -rw-r--r-- | lib/pleroma/helpers/media_helper.ex | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/pleroma/helpers/media_helper.ex b/lib/pleroma/helpers/media_helper.ex index ee6b76c41..ecd234558 100644 --- a/lib/pleroma/helpers/media_helper.ex +++ b/lib/pleroma/helpers/media_helper.ex @@ -7,8 +7,6 @@ defmodule Pleroma.Helpers.MediaHelper do Handles common media-related operations. """ - @ffmpeg_opts [{:sync, true}, {:stdout, true}] - def ffmpeg_resize_remote(uri, %{max_width: max_width, max_height: max_height}) do cmd = ~s""" curl -L "#{uri}" | @@ -20,7 +18,7 @@ defmodule Pleroma.Helpers.MediaHelper do cat """ - with {:ok, [stdout: stdout_list]} <- Exexec.run(cmd, @ffmpeg_opts) do + with {:ok, [stdout: stdout_list]} <- Pleroma.Exec.cmd(cmd) do {:ok, Enum.join(stdout_list)} end end |