generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

atrac3/decode_gain_control: cosmetics

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Maxim Poliakovski 2013-10-02 02:23:16 +02:00 committed by Michael Niedermayer
parent 4978be2bc6
commit 4fa2484067
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/atrac3.c
View File

@ -418,28 +418,27 @@ 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, cf, num_data; int i, b;
int *level, *loc; int *level, *loc;
AtracGainInfo *gain = block->g_block; AtracGainInfo *gain = block->g_block;
for (i = 0; i <= num_bands; i++) { for (b = 0; b <= num_bands; b++) {
num_data = get_bits(gb, 3); gain[b].num_points = get_bits(gb, 3);
gain[i].num_points = num_data; level = gain[b].levcode;
level = gain[i].lev_code; loc = gain[b].loccode;
loc = gain[i].loc_code;
for (cf = 0; cf < gain[i].num_points; cf++) { for (i = 0; i < gain[b].num_points; i++) {
level[cf] = get_bits(gb, 4); level[i] = get_bits(gb, 4);
loc [cf] = get_bits(gb, 5); loc [i] = get_bits(gb, 5);
if (cf && loc[cf] <= loc[cf - 1]) if (i && loc[i] <= loc[i-1])
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
} }
/* Clear the unused blocks. */ /* Clear unused blocks. */
for (; i < 4 ; i++) for (; b < 4 ; b++)
gain[i].num_points = 0; gain[b].num_points = 0;
return 0; return 0;
} }