Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-13 16:00:55 +0300
committerMichael Niedermayer <michaelni@gmx.at>2014-11-13 16:01:41 +0300
commit2c4d5d3497e92f37604ab20d14bc509c14b08992 (patch)
treefdcad3017f67704faf4859634e351e0abbe2b1db /libavcodec/escape124.c
parent9b424accbe103c304099325c133c4ce1ed9dfe85 (diff)
parent1a9c1333b5d70b427c82cb98f383aa2fa9b2b319 (diff)
Merge commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319'
* commit '1a9c1333b5d70b427c82cb98f383aa2fa9b2b319': escape124: explicitly set get_bits1 variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/escape124.c')
-rw-r--r--libavcodec/escape124.c7
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;