[Gnash-commit] [SCM] Gnash branch, ffmpeg, updated. release_0_8_9_final-1180-g99cedd1

[Rob Savoye]

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, ffmpeg has been updated
       via  99cedd1cd8132d21569ff53bf678b4a1cea04b91 (commit)
       via  8285b82fb7e77ee835daf2e7447ca043f5583713 (commit)
      from  22cdd3af90b5dd7c583ce6052a7250b34b4c1264 (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=99cedd1cd8132d21569ff53bf678b4a1cea04b91


commit 99cedd1cd8132d21569ff53bf678b4a1cea04b91
Author: Rob Savoye <address@hidden>
Date:   Mon Sep 12 17:06:49 2011 -0600

    minor version tweaks to get Lenny to build with the patch.

diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.cpp 
b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
index 8be44c7..7307531 100644
--- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp
+++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
@@ -30,6 +30,11 @@
 // type is just "mixed/multipart"). Perhaps the codec will be configurable via
 // ActionScript sometime. - Udo 
 
+// Older versions of ffmpeg don't have this macros for converting version 
numbers.
+#ifndef AV_VERSION_INT
+# define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
+#endif
+
 namespace gnash {
 namespace media {
 namespace ffmpeg {
@@ -341,7 +346,8 @@ 
MediaParserFfmpeg::MediaParserFfmpeg(std::auto_ptr<IOChannel> stream)
 void
 MediaParserFfmpeg::logMetadataEntry(const char *format, const char* key)
 {
-#if !defined (LIBAVFORMAT_VERSION_MAJOR) || LIBAVFORMAT_VERSION_MAJOR < 
AV_VERSION_INT( 51, 5, 0 )
+#if !defined (LIBAVCODEC_VERSION_INT) || LIBAVCODEC_VERSION_INT > 
AV_VERSION_INT( 51, 50, 0 )
+# if !defined (LIBAVFORMAT_VERSION_INT) || LIBAVFORMAT_VERSION_INT > 
AV_VERSION_INT( 51, 5, 0 )
     const AVMetadataTag* entry = av_metadata_get(_formatCtx->metadata, key, 0, 
0);
 #else
     const AVDictionaryEntry* entry = av_dict_get(_formatCtx->metadata, key, 0, 
0);
@@ -349,6 +355,7 @@ MediaParserFfmpeg::logMetadataEntry(const char *format, 
const char* key)
     if ( entry->value[0] ) {
         log_debug(format, entry->value);
     }
+#endif
 }
 void
 MediaParserFfmpeg::initializeParser()

http://git.savannah.gnu.org/cgit//commit/?id=8285b82fb7e77ee835daf2e7447ca043f5583713


commit 8285b82fb7e77ee835daf2e7447ca043f5583713
Author: Rob Savoye <address@hidden>
Date:   Mon Sep 12 17:05:50 2011 -0600

    optionally include avcodec.h

diff --git a/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 
b/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
index b5d4fe4..8fca013 100644
--- a/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
+++ b/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
@@ -29,7 +29,7 @@
 #include <vector>
 #include <boost/scoped_array.hpp>
 #ifdef HAVE_FFMPEG_AVCODEC_H
-# include <libavcodec/avcodec.h>
+# include <avcodec.h>
 #endif
 
 namespace gnash {

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

Summary of changes:
 libmedia/ffmpeg/AudioResamplerFfmpeg.cpp |    2 +-
 libmedia/ffmpeg/MediaParserFfmpeg.cpp    |    9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash