From: Dustin Brody <libav@parsoma.net>
Date: Thu, 11 Aug 2011 12:57:58 +0000 (-0400)
Subject: h264: notice memory allocation failure
X-Git-Tag: v0.8b1~1827
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bac3ab13ea6a9dd8853e79ef3eacf51d234c8774;p=platform%2Fupstream%2Flibav.git

h264: notice memory allocation failure

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
---

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 9ab2498..c2229ff 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1138,7 +1138,10 @@ static int decode_update_thread_context(AVCodecContext *dst, const AVCodecContex
         memcpy(&h->s + 1, &h1->s + 1, sizeof(H264Context) - sizeof(MpegEncContext)); //copy all fields after MpegEnc
         memset(h->sps_buffers, 0, sizeof(h->sps_buffers));
         memset(h->pps_buffers, 0, sizeof(h->pps_buffers));
-        ff_h264_alloc_tables(h);
+        if (ff_h264_alloc_tables(h) < 0) {
+            av_log(dst, AV_LOG_ERROR, "Could not allocate memory for h264\n");
+            return AVERROR(ENOMEM);
+        }
         context_init(h);
 
         for(i=0; i<2; i++){
@@ -2597,7 +2600,10 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
         h->prev_interlaced_frame = 1;
 
         init_scan_tables(h);
-        ff_h264_alloc_tables(h);
+        if (ff_h264_alloc_tables(h) < 0) {
+            av_log(h->s.avctx, AV_LOG_ERROR, "Could not allocate memory for h264\n");
+            return AVERROR(ENOMEM);
+        }
 
         if (!HAVE_THREADS || !(s->avctx->active_thread_type&FF_THREAD_SLICE)) {
             if (context_init(h) < 0) {