diff options
| author | Dirk Ausserhaus <dausserhaus@gmail.com> | 2014-05-29 13:17:49 +0200 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2014-06-01 08:53:27 +0200 |
| commit | 3df0d20028cb9d2daca16ac0dc6c3ab77183da37 (patch) | |
| tree | bd943b8e794242ded9b723a747b10f53f58e6eb6 /libavcodec/ivi_common.c | |
| parent | 383136264ef40452efd86cafb2d7221cd3830b3d (diff) | |
| download | ffmpeg-3df0d20028cb9d2daca16ac0dc6c3ab77183da37.tar.gz | |
Move Indeo4 frametypes into common header.
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Diffstat (limited to 'libavcodec/ivi_common.c')
| -rw-r--r-- | libavcodec/ivi_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index 923cd7599d..cf4df18737 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -1011,7 +1011,7 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, * That's exactly the same Intel decoders do. */ if (avctx->codec_id == AV_CODEC_ID_INDEO4 && - ctx->frame_type == 0/*FRAMETYPE_INTRA*/) { + ctx->frame_type == IVI4_FRAMETYPE_INTRA) { while (get_bits(&ctx->gb, 8)); // skip version string skip_bits_long(&ctx->gb, 64); // skip padding, TODO: implement correct 8-bytes alignment if (get_bits_left(&ctx->gb) > 18 && show_bits(&ctx->gb, 18) == 0x3FFF8) |