diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 14:00:55 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 14:01:41 +0100 |
commit | 2c4d5d3497e92f37604ab20d14bc509c14b08992 (patch) | |
tree | fdcad3017f67704faf4859634e351e0abbe2b1db /libavcodec | |
parent | 9b424accbe103c304099325c133c4ce1ed9dfe85 (diff) | |
parent | 1a9c1333b5d70b427c82cb98f383aa2fa9b2b319 (diff) | |
download | ffmpeg-2c4d5d3497e92f37604ab20d14bc509c14b08992.tar.gz |
Merge commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319'
* commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319':
escape124: explicitly set get_bits1 variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/escape124.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c index c7ccf22162..28167419bd 100644 --- a/libavcodec/escape124.c +++ b/libavcodec/escape124.c @@ -143,10 +143,11 @@ static MacroBlock decode_macroblock(Escape124Context* s, GetBitContext* gb, // This function reads a maximum of 22 bits; the callers // guard this function appropriately unsigned block_index, depth; - - if (get_bits1(gb)) { + int value = get_bits1(gb); + if (value) { static const char transitions[3][2] = { {2, 1}, {0, 2}, {1, 0} }; - *codebook_index = transitions[*codebook_index][get_bits1(gb)]; + value = get_bits1(gb); + *codebook_index = transitions[*codebook_index][value]; } depth = s->codebooks[*codebook_index].depth; |