From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 14 Jul 2013 12:20:42 +0000 (+0200)
Subject: indeo: print errors if transform and block size mismatch
X-Git-Tag: android-x86-4.4-r1~2344
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=76d0a6656bbfa2d43c2ef773d9b17562e60f7ed1;p=android-x86%2Fexternal-ffmpeg.git

indeo: print errors if transform and block size mismatch

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

diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index 474140e641..81a30ac4f3 100644
--- a/libavcodec/indeo4.c
+++ b/libavcodec/indeo4.c
@@ -358,8 +358,10 @@ static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *band,
             else
                 band->transform_size = 4;
 
-            if (band->blk_size != band->transform_size)
+            if (band->blk_size != band->transform_size) {
+                av_log(avctx, AV_LOG_ERROR, "transform and block size mismatch (%d != %d)\n", band->transform_size, band->blk_size);
                 return AVERROR_INVALIDDATA;
+            }
 
             scan_indx = get_bits(&ctx->gb, 4);
             if (scan_indx == 15) {
diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c
index 5d5bec8626..4039c0a384 100644
--- a/libavcodec/indeo5.c
+++ b/libavcodec/indeo5.c
@@ -191,8 +191,10 @@ static int decode_gop_header(IVI45DecContext *ctx, AVCodecContext *avctx)
             band->is_2d_trans = band->inv_transform == ff_ivi_inverse_slant_8x8 ||
                                 band->inv_transform == ff_ivi_inverse_slant_4x4;
 
-            if (band->transform_size != band->blk_size)
+            if (band->transform_size != band->blk_size) {
+                av_log(avctx, AV_LOG_ERROR, "transform and block size mismatch (%d != %d)\n", band->transform_size, band->blk_size);
                 return AVERROR_INVALIDDATA;
+            }
 
             /* select dequant matrix according to plane and band number */
             if (!p) {