Merge remote-tracking branch 'qatar/master'

* qatar/master:
  atrac3: Generalize gain compensation code

Conflicts:
	libavcodec/atrac.c
	libavcodec/atrac.h
	libavcodec/atrac3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 4 insertions, 5 deletions

diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index 9d8cf01ed5..5fdb363009 100644
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -413,16 +413,15 @@ static int decode_tonal_components(GetBitContext *gb,
 static int decode_gain_control(GetBitContext *gb, GainBlock *block,
                                int num_bands)
 {
-    int j, b;
-
+    int b, j;
     int *level, *loc;
 
     AtracGainInfo *gain = block->g_block;
 
     for (b = 0; b <= num_bands; b++) {
         gain[b].num_points = get_bits(gb, 3);
-        level              = gain[b].levcode;
-        loc                = gain[b].loccode;
+        level              = gain[b].lev_code;
+        loc                = gain[b].loc_code;
 
         for (j = 0; j < gain[b].num_points; j++) {
             level[j] = get_bits(gb, 4);
@@ -432,7 +431,7 @@ static int decode_gain_control(GetBitContext *gb, GainBlock *block,
         }
     }
 
-    /* Clear unused blocks. */
+    /* Clear the unused blocks. */
     for (; b < 4 ; b++)
         gain[b].num_points = 0;