streamio-ffmpeg 0.7.5 → 0.7.6

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.7.6 2011-01-14
+
+* Another ruby 1.9 encoding fix
+
 == 0.7.5 2011-01-14
 
 * Fixed some ruby 1.9 issues

data/lib/ffmpeg/transcoder.rb

@@ -27,6 +27,7 @@ module FFMPEG
       last_output = nil
       Open3.popen3(command) do |stdin, stdout, stderr|
         stderr.each("r") do |line|
+          fix_encoding(line)
           output << line
           if line =~ /time=(\d+.\d+)/
             time = $1.to_f
@@ -41,8 +42,8 @@ module FFMPEG
       end
 
       if encoding_succeeded?
-        FFMPEG.logger.info "Transcoding of #{@movie.path} to #{@output_file} succeeded\n"
         yield(1.0) if block_given?
+        FFMPEG.logger.info "Transcoding of #{@movie.path} to #{@output_file} succeeded\n"
       else
         errors = @errors.empty? ? "" : " Errors: #{@errors.join(", ")}. "
         FFMPEG.logger.error "Failed encoding...\n#{command}\n\n#{output}\n#{errors}\n"
@@ -102,5 +103,11 @@ module FFMPEG
       return false if @raw_options.is_a?(String)
       true
     end
+    
+    def fix_encoding(output)
+      output[/test/]
+    rescue ArgumentError
+      output.force_encoding("ISO-8859-1")
+    end
   end
 end

data/lib/ffmpeg/version.rb

@@ -1,3 +1,3 @@
 module FFMPEG
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 5
-  version: 0.7.5
+  - 6
+  version: 0.7.6
 platform: ruby
 authors: 
 - David Backeus