hornetseye-ffmpeg 1.1.2 → 1.1.3

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-ffmpeg'
-PKG_VERSION = '1.1.2'
+PKG_VERSION = '1.1.3'
 CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -116,54 +116,6 @@ file 'ext/config.h' do |t|
   else
     raise 'Cannot find avformat.h header file'
   end
-  have_libavformat_alloc_context = check_program do |c|
-    c.puts <<EOS
-extern "C" {
-  #include <#{have_libavformat_incdir ? 'libavformat' : 'ffmpeg'}/avformat.h>
-}
-int main(void) { avformat_alloc_context(); return 0; }
-EOS
-  end
-  if have_libavformat_alloc_context
-    s << "#define HAVE_LIBAVFORMAT_ALLOC_CONTEXT 1\n"
-  else
-    have_alloc_format_context = check_program do |c|
-      c.puts <<EOS
-extern "C" {
-  #include <#{have_libavformat_incdir ? 'libavformat' : 'ffmpeg'}/avformat.h>
-}
-int main(void) { av_alloc_format_context(); return 0; }
-EOS
-    end
-    unless have_alloc_format_context
-      raise 'Cannot find constructor for AVFormatContext'
-    end
-    s << "#undef HAVE_LIBAVFORMAT_ALLOC_CONTEXT\n"
-  end
-  have_byteio_ptr = check_program do |c|
-    c.puts <<EOS
-extern "C" {
-  #include <#{have_libavformat_incdir ? 'libavformat' : 'ffmpeg'}/avformat.h>
-}
-int main(void) { AVFormatContext *c; url_fclose( c->pb ); return 0; }
-EOS
-  end
-  if have_byteio_ptr
-    s << "#define HAVE_BYTEIO_PTR 1\n"
-  else
-    have_byteio_inst = check_program do |c|
-      c.puts <<EOS
-extern "C" {
-  #include <#{have_libavformat_incdir ? 'libavformat' : 'ffmpeg'}/avformat.h>
-}
-int main(void) { AVFormatContext *c; url_fclose( &c->pb ); return 0; }
-EOS
-    end
-    unless have_byteio_inst
-      raise 'Cannot find ByteIOContext member variable'
-    end
-    s << "#undef HAVE_BYTEIO_PTR\n"
-  end
   File.open( t.name, 'w' ) { |f| f.puts s }
 end
 

data/ext/avinput.cc

@@ -35,6 +35,7 @@ AVInput::AVInput( const string &mrl, bool audio ) throw (Error):
   m_swsContext(NULL), m_vFrame(NULL), m_aFrame(NULL)
 {
   try {
+    av_register_all();
     int err = avformat_open_input(&m_ic, mrl.c_str(), NULL, NULL);
     ERRORMACRO( err >= 0, Error, , "Error opening file \"" << mrl << "\": "
                 << strerror( errno ) );

data/ext/avoutput.cc

@@ -45,15 +45,13 @@ AVOutput::AVOutput( const string &mrl, int videoBitRate, int width, int height,
 {
   try {
     AVOutputFormat *format;
+    av_register_all();
     format = av_guess_format( NULL, mrl.c_str(), NULL );
     if ( format == NULL ) format = av_guess_format( "mpeg", NULL, NULL );
     ERRORMACRO( format != NULL, Error, ,
                 "Could not find suitable output format for \"" << mrl << "\""  );
-#ifdef HAVE_LIBAVFORMAT_ALLOC_CONTEXT
     m_oc = avformat_alloc_context();
-#else
-    m_oc = av_alloc_format_context();
-#endif
+    // 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() );
@@ -193,11 +191,7 @@ void AVOutput::close(void)
     m_audioStream = NULL;
     m_videoStream = NULL;
     if ( m_fileOpen ) {
-#ifdef HAVE_BYTEIO_PTR
       url_fclose( m_oc->pb );
-#else
-      url_fclose( &m_oc->pb );
-#endif
       m_fileOpen = false;
     };
     av_free( m_oc );

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hornetseye-ffmpeg
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-22 00:00:00 Z
+date: 2013-04-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: malloc