[Gnash-commit] gnash ChangeLog libmedia/sdl/VideoDecoderFfmpeg...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/10/06 10:32:28

Modified files:
        .              : ChangeLog 
        libmedia/sdl   : VideoDecoderFfmpeg.cpp 

Log message:
                * libmedia/sdl/VideoDecoderFfmpeg.cpp (decode): check return 
from
                  avcodec_alloc_frame.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4557&r2=1.4558
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/VideoDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4557
retrieving revision 1.4558
diff -u -b -r1.4557 -r1.4558
--- ChangeLog   6 Oct 2007 10:31:18 -0000       1.4557
+++ ChangeLog   6 Oct 2007 10:32:28 -0000       1.4558
@@ -1,5 +1,8 @@
+
 2007-10-06 Sandro Santilli <address@hidden>
 
+       * libmedia/sdl/VideoDecoderFfmpeg.cpp (decode): check return from
+         avcodec_alloc_frame.
        * libbase/curl_adapter.cpp (fill_cache): fix compiler warning
          (printf formats)
 

Index: libmedia/sdl/VideoDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/VideoDecoderFfmpeg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/sdl/VideoDecoderFfmpeg.cpp 4 Oct 2007 09:41:46 -0000       1.3
+++ libmedia/sdl/VideoDecoderFfmpeg.cpp 6 Oct 2007 10:32:28 -0000       1.4
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-// $Id: VideoDecoderFfmpeg.cpp,v 1.3 2007/10/04 09:41:46 tgc Exp $
+// $Id: VideoDecoderFfmpeg.cpp,v 1.4 2007/10/06 10:32:28 strk Exp $
 
 #include "VideoDecoderFfmpeg.h"
 
@@ -215,6 +215,11 @@
 {
        // Allocate a frame to store the decoded frame in
        AVFrame* frame = avcodec_alloc_frame();
+       if ( ! frame )
+       {
+               log_error(_("Out of memory while allocating avcodec frame"));
+               return NULL;
+       }
 
        int got = 0;
        avcodec_decode_video(_videoCodecCtx, frame, &got, input, inputSize);