[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-440-ge1189a7

[Benjamin Wolsey]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  e1189a7ebf1df6a8ab044cd340ac4a43b57797b7 (commit)
      from  d55ace339d6770e3a512ab859925cea7180b0a80 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=e1189a7ebf1df6a8ab044cd340ac4a43b57797b7


commit e1189a7ebf1df6a8ab044cd340ac4a43b57797b7
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Jul 7 12:53:13 2011 +0200

    Put ifdef back in because Lenny needs it.

diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.cpp 
b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
index 95c009a..d36df9f 100644
--- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp
+++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
@@ -376,8 +376,14 @@ MediaParserFfmpeg::initializeParser()
                  );
     
     _byteIOCxt.is_streamed = 1;
- 
+
+#if !defined(LIBAVCODEC_VERSION_MAJOR) || LIBAVCODEC_VERSION_MAJOR < 52
+    // Needed for Lenny.
+    _formatCtx = av_alloc_format_context();
+#else
     _formatCtx = avformat_alloc_context();
+#endif
+
     assert(_formatCtx);
 
     // Otherwise av_open_input_stream will reallocate the context.

-----------------------------------------------------------------------

Summary of changes:
 libmedia/ffmpeg/MediaParserFfmpeg.cpp |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash