[FFmpeg-cvslog] r15313 - trunk/libavcodec/aac.c

[superdump]

Author: superdump
Date: Sat Sep 13 22:22:31 2008
New Revision: 15313

Log:
Operands of '+' are not necessarily evaluated in order so r15311 was pointless.
Splitting the assignment onto two lines should resolve the order issue.


Modified:
   trunk/libavcodec/aac.c

Modified: trunk/libavcodec/aac.c
==============================================================================
--- trunk/libavcodec/aac.c	(original)
+++ trunk/libavcodec/aac.c	Sat Sep 13 22:22:31 2008
@@ -597,7 +597,8 @@ static int decode_scalefactors(AACContex
 static void decode_pulses(Pulse * pulse, GetBitContext * gb, const uint16_t * swb_offset) {
     int i;
     pulse->num_pulse = get_bits(gb, 2) + 1;
-    pulse->pos[0]    = swb_offset[get_bits(gb, 6)] + get_bits(gb, 5);
+    pulse->pos[0]    = swb_offset[get_bits(gb, 6)];
+    pulse->pos[0]   += get_bits(gb, 5);
     pulse->amp[0]    = get_bits(gb, 4);
     for (i = 1; i < pulse->num_pulse; i++) {
         pulse->pos[i] = get_bits(gb, 5) + pulse->pos[i-1];