X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2Fffmpeg%2Flibavcodec%2Fmlp_parser.c;h=4bb82eebbf0c616507a240cb11072310675995be;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=dae19e756b27ff024f94488eb894975e78002894;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/ffmpeg/libavcodec/mlp_parser.c b/src/third_party/ffmpeg/libavcodec/mlp_parser.c
index dae19e7..4bb82ee 100644
--- a/src/third_party/ffmpeg/libavcodec/mlp_parser.c
+++ b/src/third_party/ffmpeg/libavcodec/mlp_parser.c
@@ -230,6 +230,7 @@ static int mlp_parse(AVCodecParserContext *s,
     int sync_present;
     uint8_t parity_bits;
     int next;
+    int ret;
     int i, p = 0;
 
     *poutbuf_size = 0;
@@ -256,7 +257,10 @@ static int mlp_parse(AVCodecParserContext *s,
             return buf_size;
         }
 
-        ff_combine_frame(&mp->pc, i - 7, &buf, &buf_size);
+        if ((ret = ff_combine_frame(&mp->pc, i - 7, &buf, &buf_size)) < 0) {
+            av_log(avctx, AV_LOG_WARNING, "ff_combine_frame failed\n");
+            return ret;
+        }
 
         return i - 7;
     }