diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-02 21:19:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-02 21:19:41 +0200 |
| commit | b286383bd2b13fdf59aecdb23d8514323460483b (patch) | |
| tree | 4f8ee9745d719e2918843d0d8ebcf053ac220ef4 /libavcodec/smacker.c | |
| parent | 7c84e7d33762a4bccc0002476a3b20e0b8f26fcc (diff) | |
| parent | 5e745cefc0f89cf698c4cf0104182472fe0f603e (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
asfdec: read attached pictures.
apetag: reindent
apetag: export attached covers as video streams.
apetag: fix the amount of data read from binary tags.
apetag: make sure avio_get_str() doesn't read more than it should.
mov: read itunes cover art.
snow: remove VLA in mc_block()
intfloat: Don't use designated initializers in the public headers
snow: remove a VLA.
doc: Remind devs to check return values, especially for malloc() et al
MS ATC Screen (aka MSS3) decoder
vf_yadif: move x86 init code to x86/yadif.c
vf_gradfun: move x86 init code to x86/gradfun.c
roqvideo: Remove a totally unused dspcontext
smacker: remove some unused code
dsicin: remove dead assignment
aacdec: remove dead assignment
rl2: remove dead assignment
proresenc: make a variable local to the loop where it is used
alsdec: remove dead assignments
Conflicts:
Changelog
doc/developer.texi
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavfilter/gradfun.h
libavfilter/x86/gradfun.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/smacker.c')
| -rw-r--r-- | libavcodec/smacker.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 017942063e..0736e33130 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -137,13 +137,9 @@ static int smacker_decode_bigtree(GetBitContext *gb, HuffContext *hc, DBCtx *ctx return -1; } if(!get_bits1(gb)){ //Leaf - int val, i1, i2, b1, b2; - b1 = get_bits_count(gb); + int val, i1, i2; i1 = ctx->v1->table ? get_vlc2(gb, ctx->v1->table, SMKTREE_BITS, 3) : 0; - b1 = get_bits_count(gb) - b1; - b2 = get_bits_count(gb); i2 = ctx->v2->table ? get_vlc2(gb, ctx->v2->table, SMKTREE_BITS, 3) : 0; - b2 = get_bits_count(gb) - b2; if (i1 < 0 || i2 < 0) return -1; val = ctx->recode1[i1] | (ctx->recode2[i2] << 8); |