Commit fbd91d7c authored by Robert Swain's avatar Robert Swain

Work around GCC variable may be used uninitialised warning

Originally committed as revision 14881 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 1098e8d2
...@@ -615,9 +615,7 @@ static int decode_tns(AACContext * ac, TemporalNoiseShaping * tns, ...@@ -615,9 +615,7 @@ static int decode_tns(AACContext * ac, TemporalNoiseShaping * tns,
const int is8 = ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE; const int is8 = ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE;
const int tns_max_order = is8 ? 7 : ac->m4ac.object_type == AOT_AAC_MAIN ? 20 : 12; const int tns_max_order = is8 ? 7 : ac->m4ac.object_type == AOT_AAC_MAIN ? 20 : 12;
for (w = 0; w < ics->num_windows; w++) { for (w = 0; w < ics->num_windows; w++) {
tns->n_filt[w] = get_bits(gb, 2 - is8); if ((tns->n_filt[w] = get_bits(gb, 2 - is8))) {
if (tns->n_filt[w])
coef_res = get_bits1(gb); coef_res = get_bits1(gb);
for (filt = 0; filt < tns->n_filt[w]; filt++) { for (filt = 0; filt < tns->n_filt[w]; filt++) {
...@@ -638,6 +636,7 @@ static int decode_tns(AACContext * ac, TemporalNoiseShaping * tns, ...@@ -638,6 +636,7 @@ static int decode_tns(AACContext * ac, TemporalNoiseShaping * tns,
for (i = 0; i < tns->order[w][filt]; i++) for (i = 0; i < tns->order[w][filt]; i++)
tns->coef[w][filt][i] = tns_tmp2_map[tmp2_idx][get_bits(gb, coef_len)]; tns->coef[w][filt][i] = tns_tmp2_map[tmp2_idx][get_bits(gb, coef_len)];
} }
}
} }
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment