[Gnash-commit] [SCM] Gnash branch, master, updated. f57a951cb7f84fc4d9affd812a4e7dacd1de0551

[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  f57a951cb7f84fc4d9affd812a4e7dacd1de0551 (commit)
      from  5611aab15831d95344e727d5fe0886f9378327fa (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=f57a951cb7f84fc4d9affd812a4e7dacd1de0551


commit f57a951cb7f84fc4d9affd812a4e7dacd1de0551
Author: Sandro Santilli <address@hidden>
Date:   Sat Oct 30 22:37:04 2010 +0200

    Survive avcodec_decode_audio failure or empty return (fixes SIGFPE running 
NetStrem-SquareTest with plain ffmpeg from ubuntu 10.04)

diff --git a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 
b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
index 625eb47..678c709 100644
--- a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
+++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
@@ -554,6 +554,7 @@ AudioDecoderFfmpeg::decodeFrame(const boost::uint8_t* input,
         outputSize = 0;
 
         av_free(output);
+        return NULL;
     }
 
     if (outSize < 2) {
@@ -563,6 +564,7 @@ AudioDecoderFfmpeg::decodeFrame(const boost::uint8_t* input,
         outputSize = 0;
 
         av_free(output);
+        return NULL;
     }
 
     // Resampling is needed.

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

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


hooks/post-receive
-- 
Gnash