From: Una <me@unascribed.com>
Date: Fri, 2 Sep 2022 07:29:31 +0000 (-0700)
Subject: Fix audio always being re-encoded even for passthrough-eligible media (#1839)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=87c7742e7d457a6e8f5740eeec1b5bbc1d608272;p=mastodon.git

Fix audio always being re-encoded even for passthrough-eligible media (#1839)
---

diff --git a/lib/paperclip/transcoder.rb b/lib/paperclip/transcoder.rb
index afd9f58ff..b3b55f82f 100644
--- a/lib/paperclip/transcoder.rb
+++ b/lib/paperclip/transcoder.rb
@@ -40,8 +40,10 @@ module Paperclip
         @output_options['f']       = 'image2'
         @output_options['vframes'] = 1
       when 'mp4'
-        @output_options['acodec'] = 'aac'
-        @output_options['strict'] = 'experimental'
+        unless eligible_to_passthrough?(metadata)
+          @output_options['acodec'] = 'aac'
+          @output_options['strict'] = 'experimental'
+        end
 
         if high_vfr?(metadata) && !eligible_to_passthrough?(metadata)
           @output_options['vsync'] = 'vfr'