Commit 2c4d5d34 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '1a9c1333'

* commit '1a9c1333':
  escape124: explicitly set get_bits1 variable
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 9b424acc 1a9c1333
...@@ -143,10 +143,11 @@ static MacroBlock decode_macroblock(Escape124Context* s, GetBitContext* gb, ...@@ -143,10 +143,11 @@ static MacroBlock decode_macroblock(Escape124Context* s, GetBitContext* gb,
// This function reads a maximum of 22 bits; the callers // This function reads a maximum of 22 bits; the callers
// guard this function appropriately // guard this function appropriately
unsigned block_index, depth; unsigned block_index, depth;
int value = get_bits1(gb);
if (get_bits1(gb)) { if (value) {
static const char transitions[3][2] = { {2, 1}, {0, 2}, {1, 0} }; 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; depth = s->codebooks[*codebook_index].depth;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment