From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 29 Jun 2013 23:29:49 +0000 (+0200)
Subject: 4xm: Dont ignore dc run errors
X-Git-Tag: android-x86-4.4-r1~2659
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=68efb1d60a99184c7c04b4a87dbea960d373b12a;p=android-x86%2Fexternal-ffmpeg.git

4xm: Dont ignore dc run errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index dc84e96953..6acdd56dc3 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -506,8 +506,10 @@ static int decode_i_block(FourXContext *f, int16_t *block)
 
     /* DC coef */
     val = get_vlc2(&f->pre_gb, f->pre_vlc.table, ACDC_VLC_BITS, 3);
-    if (val >> 4)
+    if (val >> 4) {
         av_log(f->avctx, AV_LOG_ERROR, "error dc run != 0\n");
+        return AVERROR_INVALIDDATA;
+    }
 
     if (val)
         val = get_xbits(&f->gb, val);