RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319' 

* commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319':
  escape124: explicitly set get_bits1 variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-13 14:00:55 +01:00
parent 9b424accbe 1a9c1333b5
commit 2c4d5d3497
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/escape124.c
View File

@ -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;