paperclip-ffmpeg 0.2.2 → 0.2.3

data/lib/paperclip-ffmpeg.rb

@@ -47,17 +47,19 @@ module Paperclip
             target_width = $1
             target_height = $2
           end
-          current_geometry = @meta[:size].split('x')
-          current_width = current_geometry[0]
-          current_height = current_geometry[1]
-          if @keep_aspect
-            # Correct size to keep aspect
-            if current_width.to_i > target_width.to_i
-              # Scaling down
-              width = target_width.to_i
-              height = (width.to_f / (@meta[:aspect].to_f)).to_i
-            else
-              # TODO: Padding
+          unless @meta[:size].nil?
+            current_geometry = @meta[:size].split('x')
+            current_width = current_geometry[0]
+            current_height = current_geometry[1]
+            if @keep_aspect
+              # Correct size to keep aspect
+              if current_width.to_i > target_width.to_i
+                # Scaling down
+                width = target_width.to_i
+                height = (width.to_f / (@meta[:aspect].to_f)).to_i
+              else
+                # TODO: Padding
+              end
             end
             @convert_options[:s] = "#{width.to_i}x#{height.to_i}" unless width.nil? || height.nil?
           else
@@ -96,7 +98,7 @@ module Paperclip
           meta[:fps] = $1.to_i
         end
         # Matching lines like:
-        # Video: mjpeg, yuvj420p, 640x480 [PAR 72:72 DAR 4:3], 10301 kb/s, 30 fps, 30 tbr, 600 tbn, 600 tbc
+        # Video: h264, yuvj420p, 640x480 [PAR 72:72 DAR 4:3], 10301 kb/s, 30 fps, 30 tbr, 600 tbn, 600 tbc
         if line =~ /Video:(\s.?(\w*),\s.?(\w*),\s(\d*x\d*)\s.?PAR\s.?(\d*):(\d*)\s.?DAR\s(\d*):(\d*))/
           meta[:size] = $4
           meta[:aspect] = $7.to_f / $8.to_f

data/lib/paperclip-ffmpeg/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module Ffmpeg
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: paperclip-ffmpeg
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Omar Abdel-Wahab
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 +02:00
+date: 2011-06-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency