[Gnash-commit] [SCM] Gnash branch, ffmpeg, updated. release_0_8_9_final-1178-g22cdd3a

[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  22cdd3af90b5dd7c583ce6052a7250b34b4c1264 (commit)
       via  8fc7e3cfb38ac566d74c3f48fa4bc6ea463b4412 (commit)
       via  2347e34c4711a063f8eee9a741ec30c4a7b95b6c (commit)
       via  be9ebec227ccb10371c62bd8fb1b7c6791494d7a (commit)
       via  4f73421ded047cb2992c8727f8dc9a3943067425 (commit)
      from  bafd0053ff2e4a645a5463c8d04e42b464bf988e (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=22cdd3af90b5dd7c583ce6052a7250b34b4c1264


commit 22cdd3af90b5dd7c583ce6052a7250b34b4c1264
Author: Rob Savoye <address@hidden>
Date:   Sun Sep 11 22:07:04 2011 -0600

    use LIBAVFORMAT_VERSION_MAJOR instead of LIBAVUTIL_VERSION_INT

diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.cpp 
b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
index 072b117..8be44c7 100644
--- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp
+++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
@@ -341,7 +341,7 @@ 
MediaParserFfmpeg::MediaParserFfmpeg(std::auto_ptr<IOChannel> stream)
 void
 MediaParserFfmpeg::logMetadataEntry(const char *format, const char* key)
 {
-#if !defined (LIBAVUTIL_VERSION_INT) || LIBAVUTIL_VERSION_INT < 
AV_VERSION_INT( 51, 5, 0 )
+#if !defined (LIBAVFORMAT_VERSION_MAJOR) || LIBAVFORMAT_VERSION_MAJOR < 
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);

http://git.savannah.gnu.org/cgit//commit/?id=8fc7e3cfb38ac566d74c3f48fa4bc6ea463b4412


commit 8fc7e3cfb38ac566d74c3f48fa4bc6ea463b4412
Author: Rob Savoye <address@hidden>
Date:   Sun Sep 11 22:00:39 2011 -0600

    change order of ifdef

diff --git a/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 
b/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
index b581bcb..b5d4fe4 100644
--- a/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
+++ b/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
@@ -53,14 +53,14 @@ AudioResamplerFfmpeg::init( AVCodecContext* ctx )
 {
   if ( (ctx->sample_rate != 44100) || (ctx->channels != 2) ) {
     if ( ! _context ) {
-#if !defined (LIBAVFORMAT_VERSION_MAJOR) || LIBAVFORMAT_VERSION_MAJOR >= 53
+#if !defined (LIBAVFORMAT_VERSION_MAJOR) || LIBAVFORMAT_VERSION_MAJOR < 53
+      _context = audio_resample_init(
+               2, ctx->channels, 44100, ctx->sample_rate
+#else        
       _context = av_audio_resample_init(
                2, ctx->channels, 44100, ctx->sample_rate,
                AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16,
                16, 10, 0, 0.8
-#else
-      _context = audio_resample_init(
-               2, ctx->channels, 44100, ctx->sample_rate
 #endif
        );
     }

http://git.savannah.gnu.org/cgit//commit/?id=2347e34c4711a063f8eee9a741ec30c4a7b95b6c


commit 2347e34c4711a063f8eee9a741ec30c4a7b95b6c
Author: Rob Savoye <address@hidden>
Date:   Sun Sep 11 21:50:13 2011 -0600

    include avcodec.h if it exists

diff --git a/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 
b/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
index 7f5b6d6..b581bcb 100644
--- a/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
+++ b/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
@@ -18,13 +18,19 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
+
 #include "AudioResamplerFfmpeg.h"
 #include "log.h"
 
 #include <cmath>
 #include <vector>
 #include <boost/scoped_array.hpp>
-#include <libavcodec/avcodec.h>
+#ifdef HAVE_FFMPEG_AVCODEC_H
+# include <libavcodec/avcodec.h>
+#endif
 
 namespace gnash {
 namespace media {

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


commit be9ebec227ccb10371c62bd8fb1b7c6791494d7a
Author: Rob Savoye <address@hidden>
Date:   Sun Sep 11 21:47:11 2011 -0600

    more fixes for other ffmpeg versions and distributions

diff --git a/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 
b/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
index 2ff7aab..7f5b6d6 100644
--- a/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
+++ b/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
@@ -24,6 +24,7 @@
 #include <cmath>
 #include <vector>
 #include <boost/scoped_array.hpp>
+#include <libavcodec/avcodec.h>
 
 namespace gnash {
 namespace media {

http://git.savannah.gnu.org/cgit//commit/?id=4f73421ded047cb2992c8727f8dc9a3943067425


commit 4f73421ded047cb2992c8727f8dc9a3943067425
Author: Rob Savoye <address@hidden>
Date:   Sun Sep 11 21:39:10 2011 -0600

    fixes for other ffmpeg versions and distributions

diff --git a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 
b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
index 61f9496..20ed412 100644
--- a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
+++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
@@ -625,9 +625,9 @@ AudioDecoderFfmpeg::parseInput(const boost::uint8_t* input,
     if ( _needsParsing ) {
 #if !defined (LIBAVCODEC_VERSION_MAJOR) || LIBAVCODEC_VERSION_MAJOR < 53
         return av_parser_parse(_parser, _audioCodecCtx,
-                               outFrameSize,
-                               input, inputSize,
-                    0, 0); // pts & dts
+                               
reinterpret_cast<boost::uint8_t**>(outFrameSize),
+                               outFrameSize, input, inputSize,
+                               0, 0); // pts & dts
 #else
         return av_parser_parse2(_parser, _audioCodecCtx,
                     // as of 2008-10-28 SVN, ffmpeg doesn't
diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.h 
b/libmedia/ffmpeg/MediaParserFfmpeg.h
index 7ec0de0..2516f2d 100644
--- a/libmedia/ffmpeg/MediaParserFfmpeg.h
+++ b/libmedia/ffmpeg/MediaParserFfmpeg.h
@@ -96,10 +96,9 @@ public:
 
 private:
 
-#if defined (LIBAVFORMAT_VERSION_INT) && LIBAVFORMAT_VERSION_INT >= 
AV_VERSION_INT( 52, 31, 0 )
-       /// Log debugging information about a metadata entry
-       void logMetadataEntry(const char *format, const char* key);
-#endif
+        /// Log debugging information about a metadata entry
+        void logMetadataEntry(const char *format, const char* key);
+
         /// Initialize parser, figuring format and 
        /// creating VideoInfo and AudioInfo objects
        void initializeParser();

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

Summary of changes:
 libmedia/ffmpeg/AudioDecoderFfmpeg.cpp   |    6 +++---
 libmedia/ffmpeg/AudioResamplerFfmpeg.cpp |   15 +++++++++++----
 libmedia/ffmpeg/MediaParserFfmpeg.cpp    |    2 +-
 libmedia/ffmpeg/MediaParserFfmpeg.h      |    7 +++----
 4 files changed, 18 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Gnash