streamio-ffmpeg 0.4.2 → 0.4.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.4.3 20010-04-06
+
+* Correctly identify invalid movies on latest ffmpeg build (r22811)
+
 == 0.4.2 20010-04-06
 
 * Escape the path to handle spaces in filenames and avoid CLI injection attacks (thanks J. Weir!)

data/README.rdoc

@@ -6,7 +6,7 @@ Simple yet powerful wrapper around the ffmpeg command for reading metadata and t
 
   (sudo) gem install streamio-ffmpeg
 
-This version is written against an ffmpeg build from january 2010. So expect things to fail if you're using an earlier (or much later) version. Output and input standards have inconveniently changed rather a lot between versions of ffmpeg. My goal is to keep this library in sync with new versions of ffmpeg as they come along.
+This version is written against an ffmpeg build from april 2010 (tested against r22811). So no guarantees with earlier (or much later) versions. Output and input standards have inconveniently changed rather a lot between versions of ffmpeg. My goal is to keep this library in sync with new versions of ffmpeg as they come along.
 
 == Usage
 

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/ffmpeg/movie.rb

@@ -12,7 +12,7 @@ module FFMPEG
       stdin, stdout, stderr = Open3.popen3("ffmpeg -i '#{path}'") # Output will land in stderr
       output = stderr.read
       
-      @valid = output[/Unknown format/].nil?
+      @valid = output["Unknown format"].nil? && output["Invalid data found when processing input"].nil?
       
       output[/Duration: (\d{2}):(\d{2}):(\d{2}\.\d{1})/]
       @duration = ($1.to_i*60*60) + ($2.to_i*60) + $3.to_f

data/lib/streamio-ffmpeg.rb

@@ -5,5 +5,5 @@ require 'ffmpeg/transcoder'
 require 'ffmpeg/encoding_options'
  
 module FFMPEG
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/streamio-ffmpeg.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{streamio-ffmpeg}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Backeus"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - David Backeus