diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 06:02:23 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 06:02:23 +0400 |
commit | e755c8ac462e85e6c3de4f0207dc6bb5c86409cf (patch) | |
tree | 79b263a53249817baa638e164c3d61d03d84f5fe /libavcodec/indeo4.c | |
parent | ca90ca8ce365261355f3b66936b9cc011fdd1cdc (diff) | |
parent | 4a27a52a1f74016095b7aee1b4a422cf62217ade (diff) |
Merge commit '4a27a52a1f74016095b7aee1b4a422cf62217ade'
* commit '4a27a52a1f74016095b7aee1b4a422cf62217ade':
fate: Don't use files from SRC_PATH in the actual tests
indeo4: reuse context block VLC for band instead of defaulting
Conflicts:
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo4.c')
-rw-r--r-- | libavcodec/indeo4.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index 3a77ffdd56..873b828384 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -392,9 +392,12 @@ static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *band, } /* decode block huffman codebook */ - if (ff_ivi_dec_huff_desc(&ctx->gb, get_bits1(&ctx->gb), IVI_BLK_HUFF, - &band->blk_vlc, avctx)) - return AVERROR_INVALIDDATA; + if (!get_bits1(&ctx->gb)) + band->blk_vlc.tab = ctx->blk_vlc.tab; + else + if (ff_ivi_dec_huff_desc(&ctx->gb, 1, IVI_BLK_HUFF, + &band->blk_vlc, avctx)) + return AVERROR_INVALIDDATA; /* select appropriate rvmap table for this band */ band->rvmap_sel = get_bits1(&ctx->gb) ? get_bits(&ctx->gb, 3) : 8; |