Commit 8258697c authored by Michael Niedermayer's avatar Michael Niedermayer

ivi_common: skip null frames for all indeo variants

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 6374ee72
...@@ -799,7 +799,7 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *data_size, ...@@ -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"); 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; return buf_size;
if (ctx->frame.data[0]) if (ctx->frame.data[0])
......
#tb 0: 1/15 #tb 0: 1/15
0, 0, 0, 1, 48600, 0x72d4193b 0, 0, 0, 1, 48600, 0x72d4193b
0, 1, 1, 1, 48600, 0x72d4193b
0, 2, 2, 1, 48600, 0x36abd6f3 0, 2, 2, 1, 48600, 0x36abd6f3
0, 3, 3, 1, 48600, 0x99e582f7 0, 3, 3, 1, 48600, 0x99e582f7
0, 4, 4, 1, 48600, 0xa4cb6fb7 0, 4, 4, 1, 48600, 0xa4cb6fb7
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment