ivi_common: skip null frames for all indeo variants

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

diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c
index 17178cd65d4f556129c19c69c79ab9714283a114..b84148cb7b878c359a0ef7c9a884df6b96780072 100644 (file)
--- a/libavcodec/ivi_common.c
+++ b/libavcodec/ivi_common.c
@@ -799,7 +799,7 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
             av_log(avctx, AV_LOG_ERROR, "Buffer contains IP frames!\n");
     }
 
-    if (avctx->codec_id == CODEC_ID_INDEO4 && !ctx->is_nonnull_frame(ctx))
+    if (!ctx->is_nonnull_frame(ctx))
         return buf_size;
 
     if (ctx->frame.data[0])

diff --git a/tests/ref/fate/indeo5 b/tests/ref/fate/indeo5
index 3f0adfb4ee56908100685e8a0196bba276ffe5ee..7b9123862d1e08ef4338b9e731067cef66189fd4 100644 (file)
--- a/tests/ref/fate/indeo5
+++ b/tests/ref/fate/indeo5
@@ -1,6 +1,5 @@
 #tb 0: 1/15
 0,          0,          0,        1,    48600, 0x72d4193b
-0,          1,          1,        1,    48600, 0x72d4193b
 0,          2,          2,        1,    48600, 0x36abd6f3
 0,          3,          3,        1,    48600, 0x99e582f7
 0,          4,          4,        1,    48600, 0xa4cb6fb7