diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 21:14:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 21:14:54 +0200 |
| commit | c2df95978b19d0d4b625c23a05f4bf78e8397d0b (patch) | |
| tree | 43fdb793543f9350bf1c7e2f2da23ab35576deed /libavcodec/atrac3.c | |
| parent | 6565b1ad97fe166891dd0bb6652b78216dc2d039 (diff) | |
| parent | be0b4c70ec40d7f9ac8e416a4379d4a387421184 (diff) | |
| download | ffmpeg-c2df95978b19d0d4b625c23a05f4bf78e8397d0b.tar.gz | |
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>
Diffstat (limited to 'libavcodec/atrac3.c')
| -rw-r--r-- | libavcodec/atrac3.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 245805c8ef..9d8cf01ed5 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -413,7 +413,8 @@ static int decode_tonal_components(GetBitContext *gb, static int decode_gain_control(GetBitContext *gb, GainBlock *block, int num_bands) { - int i, b; + int j, b; + int *level, *loc; AtracGainInfo *gain = block->g_block; @@ -423,10 +424,10 @@ static int decode_gain_control(GetBitContext *gb, GainBlock *block, 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[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; } } |