diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-10-03 11:10:12 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-10-03 11:10:12 +0200 |
| commit | a84aedb7a7f050cbf5293351723f55a904992b3a (patch) | |
| tree | 769d397390665bcddf9b44fc1ad4418b2757c5f1 /lib/paperclip/video_transcoder.rb | |
| parent | 857c67f31b23b9c496e07eda41755ba449a37f17 (diff) | |
| parent | bae268b2f6501ccb0ceeb8dd36180698839c4d3c (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/media_attachment.rb Upstream raised max image size from 8MB to 10MB while our limit is configurable. Raised the default to 10MB.
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 |