From 2e4afccd9d5327c072cf0a0fe5d4c6e97ecc10cf Mon Sep 17 00:00:00 2001
From: Eugen <eugen@zeonfederated.com>
Date: Wed, 19 Apr 2017 23:21:00 +0200
Subject: Fix #2108 - Fix gif uploads (#2171)
* Fix #2108 - Fix gif uploads
Add specs for media attachment gifv conversion
* Add ffmpeg to travis
* Make travis install ffmpeg, not libav
* Switch travis to trusty
---
lib/paperclip/gif_transcoder.rb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'lib/paperclip')
diff --git a/lib/paperclip/gif_transcoder.rb b/lib/paperclip/gif_transcoder.rb
index 8337448b2..cbe53b27b 100644
--- a/lib/paperclip/gif_transcoder.rb
+++ b/lib/paperclip/gif_transcoder.rb
@@ -7,7 +7,11 @@ module Paperclip
def make
num_frames = identify('-format %n :file', file: file.path).to_i
- return file unless options[:style] == :original && num_frames > 1
+ unless options[:style] == :original && num_frames > 1
+ tmp_file = Paperclip::TempfileFactory.new.generate(attachment.instance.file_file_name)
+ tmp_file << file.read
+ return tmp_file
+ end
final_file = Paperclip::Transcoder.make(file, options, attachment)
--
cgit