diff options
Diffstat (limited to 'lib/paperclip/transcoder.rb')
| -rw-r--r-- | lib/paperclip/transcoder.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/paperclip/transcoder.rb b/lib/paperclip/transcoder.rb index d2d946d3ade..00fb4767bbd 100644 --- a/lib/paperclip/transcoder.rb +++ b/lib/paperclip/transcoder.rb @@ -115,7 +115,11 @@ module Paperclip end def eligible_to_passthrough?(metadata) - @passthrough_options && @passthrough_options[:video_codecs].include?(metadata.video_codec) && @passthrough_options[:audio_codecs].include?(metadata.audio_codec) && @passthrough_options[:colorspaces].include?(metadata.colorspace) + return false if @passthrough_options.blank? + + %i(video_codec audio_codec colorspace).all? do |attribute| + @passthrough_options["#{attribute}s".to_sym].nil? || @passthrough_options["#{attribute}s".to_sym].include?(metadata.public_send(attribute)) + end end def update_attachment_type(metadata) |