Merge commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184'

* commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184':
  atrac3: Replace a silly counter variable name with plain 'j'

Conflicts:
	libavcodec/atrac3.c

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

diff --cc libavcodec/atrac3.c
index 245805c8efd20794462eb9ba2e8cf05574d0c4b7,18562a6b85ec0e7057fba706329e061ed115f5ef..9d8cf01ed5296ef4eebf6a8734157f516cb41e0d
--- 1/libavcodec/atrac3.c
--- 2/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@@ -413,20 -417,21 +413,21 @@@ static int decode_tonal_components(GetB
  static int decode_gain_control(GetBitContext *gb, GainBlock *block,
                                 int num_bands)
  {
-     int i, b;
 -    int i, j, num_data;
++    int j, b;
++
      int *level, *loc;
  
 -    GainInfo *gain = block->g_block;
 +    AtracGainInfo *gain = block->g_block;
  
 -    for (i = 0; i <= num_bands; i++) {
 -        num_data              = get_bits(gb, 3);
 -        gain[i].num_gain_data = num_data;
 -        level                 = gain[i].lev_code;
 -        loc                   = gain[i].loc_code;
 +    for (b = 0; b <= num_bands; b++) {
 +        gain[b].num_points = get_bits(gb, 3);
 +        level              = gain[b].levcode;
 +        loc                = gain[b].loccode;
  
-         for (i = 0; i < gain[b].num_points; i++) {
-             level[i] = get_bits(gb, 4);
-             loc  [i] = get_bits(gb, 5);
-             if (i && loc[i] <= loc[i-1])
 -        for (j = 0; j < gain[i].num_gain_data; j++) {
++        for (j = 0; j < gain[b].num_points; j++) {
+             level[j] = get_bits(gb, 4);
+             loc[j]   = get_bits(gb, 5);
+             if (j && loc[j] <= loc[j - 1])
                  return AVERROR_INVALIDDATA;
          }
      }