Revert "Upstream 20240517"

2024-05-24 08:15:12 +09:00 · 2024-05-24 08:15:12 +09:00 · f6dec44e95
commit f6dec44e95
parent 9c006fd893
2347 changed files with 26470 additions and 87494 deletions
--- a/lib/paperclip/transcoder.rb
+++ b/lib/paperclip/transcoder.rb
@ -61,7 +61,7 @@ module Paperclip
      command_arguments, interpolations = prepare_command(destination)

      begin
-        command = Terrapin::CommandLine.new(Rails.configuration.x.ffmpeg_binary, command_arguments.join(' '), logger: Paperclip.logger)
+        command = Terrapin::CommandLine.new('ffmpeg', command_arguments.join(' '), logger: Paperclip.logger)
        command.run(interpolations)
      rescue Terrapin::ExitStatusError => e
        raise Paperclip::Error, "Error while transcoding #{@basename}: #{e}"