diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-09-30 14:49:08 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2012-10-01 07:51:47 +0000 |
| commit | adc5539e7b94a94114d591d83e7ae63f52b5916f (patch) | |
| tree | a3d571118784926ff387a7bc5619d752cd651017 /libavcodec | |
| parent | 14fd34d73bb0bcb227b62506fb51d63751c9b190 (diff) | |
| download | ffmpeg-adc5539e7b94a94114d591d83e7ae63f52b5916f.tar.gz | |
smacker: read escape codes in single get_bits() call
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/smacker.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 4913625e37..e02c76c942 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -231,12 +231,9 @@ static int smacker_decode_header_tree(SmackVContext *smk, GetBitContext *gb, int av_log(smk->avctx, AV_LOG_ERROR, "Skipping high bytes tree\n"); } - escapes[0] = get_bits(gb, 8); - escapes[0] |= get_bits(gb, 8) << 8; - escapes[1] = get_bits(gb, 8); - escapes[1] |= get_bits(gb, 8) << 8; - escapes[2] = get_bits(gb, 8); - escapes[2] |= get_bits(gb, 8) << 8; + escapes[0] = get_bits(gb, 16); + escapes[1] = get_bits(gb, 16); + escapes[2] = get_bits(gb, 16); last[0] = last[1] = last[2] = -1; |