streamio-ffmpeg 0.7.0 → 0.7.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.7.1 2010-07-08
+
+* Make sure preset parameters are always put last to avoid them ending up before any codec assignments
+* Testing against a fresh ffmpeg build (r24069)
+
 == 0.7.0 2010-07-07
 
 * Support for ffpresets through video_preset, audio_preset and file_preset encoding options

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 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.
+This version is written against an ffmpeg build from july 2010 (tested against r24069). 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.7.0
+0.7.1

data/lib/ffmpeg/encoding_options.rb

@@ -5,11 +5,16 @@ module FFMPEG
     end
     
     def to_s
-      parameters = collect do |key, value|
+      params = collect do |key, value|
         send("convert_#{key}", value) if value && supports_option?(key)
-      end.join(" ")
-      parameters << " #{convert_aspect(calculate_aspect)}" if calculate_aspect?
-      parameters
+      end
+      
+      # put the preset parameters last
+      params = params.reject { |p| p =~ /\-.pre/ } + params.select { |p| p =~ /\-.pre/ }
+      
+      params_string = params.join(" ")
+      params_string << " #{convert_aspect(calculate_aspect)}" if calculate_aspect?
+      params_string
     end
     
     def width

data/spec/ffmpeg/encoding_options_spec.rb

@@ -102,6 +102,15 @@ module FFMPEG
         EncodingOptions.new(:file_preset => "max.ffpreset").to_s.should == "-fpre max.ffpreset"
       end
       
+      it "should put the preset parameters last" do
+        opts = Hash.new
+        opts[:video_codec] = "libx264"
+        opts[:video_preset] = "normal"
+        
+        converted = EncodingOptions.new(opts).to_s
+        converted.should == "-vcodec libx264 -vpre normal"
+      end
+      
       it "should convert a lot of them simultaneously" do
         converted = EncodingOptions.new(:video_codec => "libx264", :audio_codec => "aac", :video_bitrate => "1000k").to_s
         converted.should match(/-acodec aac/)

data/streamio-ffmpeg.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{streamio-ffmpeg}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Backeus"]
-  s.date = %q{2010-07-07}
+  s.date = %q{2010-07-08}
   s.description = %q{Simple wrapper around ffmpeg to get metadata from movies and do transcoding}
   s.email = %q{duztdruid@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: streamio-ffmpeg
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - David Backeus
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 +02:00
+date: 2010-07-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency