Fix undefined expressions that use multiple calls to get_bits().

Because the order of evaluation of subexpressions is undefined, two
get_bits() calls may not be part of the same expression.

See also r24902.

Originally committed as revision 24906 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Converse
2010-08-24 16:10:25 +00:00
parent 37b9706123
commit 4c399dc82b
2 changed files with 4 additions and 3 deletions
+2 -1
View File
@@ -1209,7 +1209,8 @@ static void qdm2_decode_super_block (QDM2Context *q)
init_get_bits(&gb, header.data, header.size*8);
if (header.type == 2 || header.type == 4 || header.type == 5) {
int csum = 257 * get_bits(&gb, 8) + 2 * get_bits(&gb, 8);
int csum = 257 * get_bits(&gb, 8);
csum += 2 * get_bits(&gb, 8);
csum = qdm2_packet_checksum(q->compressed_data, q->checksum_size, csum);