OSDN Git Service

indeo: print errors if transform and block size mismatch
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Jul 2013 12:20:42 +0000 (14:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Jul 2013 12:20:42 +0000 (14:20 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/indeo4.c
libavcodec/indeo5.c

index 474140e..81a30ac 100644 (file)
@@ -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) {
index 5d5bec8..4039c0a 100644 (file)
@@ -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) {