[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-443-gf0f5e1f

[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  f0f5e1fe8e842840f525eb3cc5e6eb31fd33cc36 (commit)
      from  57974d28142ea95c25eebe104258b6c0e0836913 (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=f0f5e1fe8e842840f525eb3cc5e6eb31fd33cc36


commit f0f5e1fe8e842840f525eb3cc5e6eb31fd33cc36
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Jul 7 15:32:42 2011 +0200

    Fix metadata build for Lenny.

diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.cpp 
b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
index d36df9f..492d26d 100644
--- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp
+++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
@@ -396,7 +396,9 @@ MediaParserFfmpeg::initializeParser()
         throw IOException("MediaParserFfmpeg couldn't open input stream");
     }
 
-    // Note: metadata doesn't work here; haven't worked out why.
+#if defined(LIBAVCODEC_VERSION_MAJOR) && LIBAVCODEC_VERSION_MAJOR >= 52
+    // Note: in at least some versions of ffmpeg, av_open_input_stream does
+    // not parse metadata; not sure why.
     AVMetadata* md = _formatCtx->metadata;
     if (md) {
         AVMetadataTag* tag = av_metadata_get(md, "album", 0,
@@ -406,6 +408,7 @@ MediaParserFfmpeg::initializeParser()
                     _id3Object);
         }
     }
+#endif
 
     log_debug("Parsing FFMPEG media file: format:%s; nstreams:%d",
         _inputFmt->name, _formatCtx->nb_streams);

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

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


hooks/post-receive
-- 
Gnash