Browse Source

ivi_common: skip null frames for all indeo variants

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.11
Michael Niedermayer 13 years ago
parent
commit
8258697c49
2 changed files with 1 additions and 2 deletions
  1. +1
    -1
      libavcodec/ivi_common.c
  2. +0
    -1
      tests/ref/fate/indeo5

+ 1
- 1
libavcodec/ivi_common.c View File

@@ -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])


+ 0
- 1
tests/ref/fate/indeo5 View File

@@ -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


Loading…
Cancel
Save