RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2013-10-03 21:14:54 +02:00
parent 6565b1ad97 be0b4c70ec
commit c2df95978b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/atrac3.c
View File

@ -413,7 +413,8 @@ static int decode_tonal_components(GetBitContext *gb,
static int decode_gain_control(GetBitContext *gb, GainBlock *block, static int decode_gain_control(GetBitContext *gb, GainBlock *block,
int num_bands) int num_bands)
{ {
int i, b; int j, b;
int *level, *loc; int *level, *loc;
AtracGainInfo *gain = block->g_block; AtracGainInfo *gain = block->g_block;
@ -423,10 +424,10 @@ static int decode_gain_control(GetBitContext *gb, GainBlock *block,
level = gain[b].levcode; level = gain[b].levcode;
loc = gain[b].loccode; loc = gain[b].loccode;
for (i = 0; i < gain[b].num_points; i++) { for (j = 0; j < gain[b].num_points; j++) {
level[i] = get_bits(gb, 4); level[j] = get_bits(gb, 4);
loc [i] = get_bits(gb, 5); loc[j] = get_bits(gb, 5);
if (i && loc[i] <= loc[i-1]) if (j && loc[j] <= loc[j - 1])
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
} }