paperclip-ffmpeg 0.3.0 → 0.3.1

data/lib/paperclip-ffmpeg/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module Ffmpeg
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/paperclip-ffmpeg.rb

@@ -100,9 +100,11 @@ module Paperclip
         end
         # Matching lines like:
         # 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
+        if line =~ /Video:(.*)/
+          v = $1.to_s.split(',')
+          size = v[2].strip!.split(' ').first
+          meta[:size] = size.to_s
+          meta[:aspect] = size.split('x').first.to_f / size.split('x').last.to_f
         end
         # Matching Duration: 00:01:31.66, start: 0.000000, bitrate: 10404 kb/s
         if line =~ /Duration:(\s.?(\d*):(\d*):(\d*\.\d*))/

metadata

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