[Gnash-commit] /srv/bzr/gnash/trunk r12327: Fix warning when building with libavformat >= 52 (tested with older and newer)

[Sandro Santilli]

------------------------------------------------------------
revno: 12327
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Thu 2010-07-22 23:55:03 +0200
message:
  Fix warning when building with libavformat >= 52 (tested with older and newer)
modified:
  libmedia/ffmpeg/MediaParserFfmpeg.cpp

=== modified file 'libmedia/ffmpeg/MediaParserFfmpeg.cpp'
--- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp     2010-03-14 02:26:46 +0000
+++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp     2010-07-22 21:55:03 +0000
@@ -352,10 +352,18 @@
                             "format");
     }
     
+// av_alloc_format_context was deprecated on
+// 2009-02-08 (r17047) in favor of avformat_alloc_context() 
+#if !defined (LIBAVCODEC_VERSION_MAJOR) || LIBAVCODEC_VERSION_MAJOR < 52
     _formatCtx = av_alloc_format_context();
+#else
+    _formatCtx = avformat_alloc_context();
+#endif
+
     assert(_formatCtx);
     
-    // Setup the filereader/seeker mechanism. 7th argument (NULL) is the 
writer function,
+    // Setup the filereader/seeker mechanism.
+    // 7th argument (NULL) is the writer function,
     // which isn't needed.
     _byteIOBuffer.reset( new unsigned char[byteIOBufferSize] );
     init_put_byte(&_byteIOCxt,