hornetseye-ffmpeg 1.1.3 → 1.1.4

data/README.md

@@ -15,7 +15,7 @@ Installation
 
 *hornetseye-ffmpeg* requires FFMpeg and the software scaling library. If you are running Debian or (K)ubuntu, you can install them like this:
 
-    $ sudo aptitude install libavformat-dev libswscale-dev
+    $ sudo aptitude install libavformat-dev libswscale-dev libboost-dev
 
 To install this Ruby extension, use the following command:
 

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-ffmpeg'
-PKG_VERSION = '1.1.3'
+PKG_VERSION = '1.1.4'
 CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
 RB_FILES = FileList[ 'lib/**/*.rb' ]

data/ext/avoutput.cc

@@ -51,7 +51,6 @@ AVOutput::AVOutput( const string &mrl, int videoBitRate, int width, int height,
     ERRORMACRO( format != NULL, Error, ,
                 "Could not find suitable output format for \"" << mrl << "\""  );
     m_oc = avformat_alloc_context();
-    // m_oc = av_alloc_format_context();
     ERRORMACRO( m_oc != NULL, Error, , "Failure allocating format context" );
     m_oc->oformat = format;
     snprintf( m_oc->filename, sizeof( m_oc->filename ), "%s", mrl.c_str() );
@@ -87,8 +86,8 @@ AVOutput::AVOutput( const string &mrl, int videoBitRate, int width, int height,
       if ( m_oc->oformat->flags & AVFMT_GLOBALHEADER )
         c->flags |= CODEC_FLAG_GLOBAL_HEADER;
     };
-    ERRORMACRO( av_set_parameters( m_oc, NULL ) >= 0, Error, ,
-                "Invalid output format parameters: " << strerror( errno ) );
+    // ERRORMACRO( av_set_parameters( m_oc, NULL ) >= 0, Error, ,
+    //             "Invalid output format parameters: " << strerror( errno ) );
     AVCodec *codec = avcodec_find_encoder( c->codec_id );
     ERRORMACRO( codec != NULL, Error, , "Could not find video codec "
                 << c->codec_id );
@@ -118,11 +117,11 @@ AVOutput::AVOutput( const string &mrl, int videoBitRate, int width, int height,
 #endif
     };
     if ( !( format->flags & AVFMT_NOFILE ) ) {
-      ERRORMACRO( url_fopen( &m_oc->pb, mrl.c_str(), URL_WRONLY ) >= 0, Error, ,
-                  "Could not open \"" << mrl << "\"" );
+      ERRORMACRO(avio_open(&m_oc->pb, mrl.c_str(), AVIO_FLAG_WRITE) >= 0, Error, ,
+                 "Could not open \"" << mrl << "\"" );
       m_fileOpen = true;
     };
-    ERRORMACRO( av_write_header( m_oc ) >= 0, Error, ,
+    ERRORMACRO( avformat_write_header(m_oc, NULL) >= 0, Error, ,
                 "Error writing header of video \"" << mrl << "\": "
                 << strerror( errno ) );
     m_headerWritten = true;
@@ -191,7 +190,7 @@ void AVOutput::close(void)
     m_audioStream = NULL;
     m_videoStream = NULL;
     if ( m_fileOpen ) {
-      url_fclose( m_oc->pb );
+      avio_close(m_oc->pb);
       m_fileOpen = false;
     };
     av_free( m_oc );
@@ -515,8 +514,10 @@ VALUE AVOutput::registerRubyClass( VALUE rbModule )
                    INT2FIX( CODEC_ID_TIFF ) );
   rb_define_const( cRubyClass, "CODEC_ID_GIF",
                    INT2FIX( CODEC_ID_GIF ) );
+#ifdef CODEC_ID_FFH264
   rb_define_const( cRubyClass, "CODEC_ID_FFH264",
                    INT2FIX( CODEC_ID_FFH264 ) );
+#endif
   rb_define_const( cRubyClass, "CODEC_ID_DXA",
                    INT2FIX( CODEC_ID_DXA ) );
   rb_define_const( cRubyClass, "CODEC_ID_DNXHD",

metadata

@@ -1,90 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hornetseye-ffmpeg
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 1.1.4
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 3
-  version: 1.1.3
 platform: ruby
-authors: 
+authors:
 - Jan Wedekind
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-09-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: malloc
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: multiarray
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: multiarray
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hornetseye-frame
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: hornetseye-frame
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: This Ruby extension defines the class Hornetseye::AVInput for reading frames from video files and the class Hornetseye::AVOutput for writing frames to video files.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: This Ruby extension defines the class Hornetseye::AVInput for reading
+  frames from video files and the class Hornetseye::AVOutput for writing frames to
+  video files.
 email: jan@wedesoft.de
 executables: []
-
-extensions: 
+extensions:
 - Rakefile
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - README.md
 - COPYING
@@ -105,37 +104,28 @@ files:
 - ext/avoutput.hh
 homepage: http://wedesoft.github.com/hornetseye-ffmpeg/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --no-private
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: hornetseye
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Read/write video frames using libffmpeg
 test_files: []
-