diff options
| author | ThibG <thib@sitedethib.com> | 2019-10-05 18:04:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-05 18:04:36 +0200 |
| commit | 3921125e5578fb3871fdcae0e8e8a77179f1ad72 (patch) | |
| tree | 997c8ed2e7a6b8152266edc0c37ea8264c59d1ab /lib/paperclip/video_transcoder.rb | |
| parent | 857c67f31b23b9c496e07eda41755ba449a37f17 (diff) | |
| parent | bc8543d9af0045fe2175f7e2234da9c77dc55023 (diff) | |
Merge pull request #1228 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib/paperclip/video_transcoder.rb')
| -rw-r--r-- | lib/paperclip/video_transcoder.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/paperclip/video_transcoder.rb b/lib/paperclip/video_transcoder.rb index c3504c17c..66f7feda5 100644 --- a/lib/paperclip/video_transcoder.rb +++ b/lib/paperclip/video_transcoder.rb @@ -6,7 +6,9 @@ module Paperclip class VideoTranscoder < Paperclip::Processor def make meta = ::Av.cli.identify(@file.path) + attachment.instance.type = MediaAttachment.types[:gifv] unless meta[:audio_encode] + options[:format] = File.extname(attachment.instance.file_file_name)[1..-1] if options[:keep_same_format] Paperclip::Transcoder.make(file, options, attachment) end |