[FFmpeg-soc] [soc]: r4160 - amr/amrnbfloatdec.c

[kmalaussene]

Author: kmalaussene
Date: Wed Mar  4 20:02:04 2009
New Revision: 4160

Log:
Merge 2 assignements.

Modified:
   amr/amrnbfloatdec.c

Modified: amr/amrnbfloatdec.c
==============================================================================
--- amr/amrnbfloatdec.c	Wed Mar  4 20:00:17 2009	(r4159)
+++ amr/amrnbfloatdec.c	Wed Mar  4 20:02:04 2009	(r4160)
@@ -1,4 +1,4 @@
-/*
+/*
  * AMR narrowband decoder (floating point)
  * Copyright (c) 2006-2007 Robert Swain
  *
@@ -714,11 +714,9 @@ static void decode_gains(AMRContext *p, 
         fixed_gain_factor = gains_MODE_475[index][1];
     }
 
-    // calculate the predicted fixed gain g_c'
-    p->fixed_gain[4] = fixed_gain_prediction(p->fixed_vector, p->prediction_error, mode);
-
     // ^g_c = g_c' * ^gamma_gc
-    p->fixed_gain[4] *= fixed_gain_factor;
+    p->fixed_gain[4] = fixed_gain_factor
+                     * fixed_gain_prediction(p->fixed_vector, p->prediction_error, mode);
 
     // update quantified prediction error energy history
     p->prediction_error[0] = p->prediction_error[1];