[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1606-g80989fc

[Sandro Santilli]

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  80989fcd47d33e30336785422ded17f4c607a113 (commit)
      from  dfba5258dc230669a7e1ad309e25ef190c77e854 (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=80989fcd47d33e30336785422ded17f4c607a113


commit 80989fcd47d33e30336785422ded17f4c607a113
Author: Alexis Ballier <address@hidden>
Date:   Thu Feb 14 17:21:50 2013 -0300

    Use av_get_bytes_per_sample in SampleFormatToSampleSize (#38333)
    
    This is more future proof against the addition of sample formats.
    
    Signed-off-by: Sandro Santilli <address@hidden>

diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.cpp 
b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
index 136cc08..83b1d74 100644
--- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp
+++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
@@ -646,6 +646,9 @@ MediaParserFfmpeg::seekMedia(boost::int64_t offset, int 
whence)
 boost::uint16_t
 MediaParserFfmpeg::SampleFormatToSampleSize(AVSampleFormat fmt)
 {
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(51,4,0)
+        return av_get_bytes_per_sample(fmt);
+#else
        switch (fmt)
        {
                case AV_SAMPLE_FMT_U8: // unsigned 8 bits
@@ -668,6 +671,7 @@ MediaParserFfmpeg::SampleFormatToSampleSize(AVSampleFormat 
fmt)
                default:
                        return 8; // arbitrary value
        }
+#endif
 }
 
 

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

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


hooks/post-receive
-- 
Gnash