summaryrefslogtreecommitdiff
path: root/libavcodec/ivi_common.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-20 23:01:22 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-21 14:56:12 +0200
commit8258697c4924122515af164ee0bf2e7f01b644b5 (patch)
tree26f1c819a4d9e6e630d76fce2925f280210949af /libavcodec/ivi_common.c
parent6374ee72df91b075870610808b73a51fdb1dad20 (diff)
ivi_common: skip null frames for all indeo variants
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ivi_common.c')
-rw-r--r--libavcodec/ivi_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c
index 17178cd65d..b84148cb7b 100644
--- 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])