diff options
| author | Alex Converse <alex.converse@gmail.com> | 2013-12-23 22:20:42 -0800 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2014-01-04 14:42:38 -0800 |
| commit | b2212dec0f011893ec68eecaa990170fa24050d7 (patch) | |
| tree | ad80a3da37a70b7a7a4a09c00d5986728bd785b4 /libavcodec/aacdec.c | |
| parent | e2096e2eaa9e75663d6bf0c37d342752aa5a146d (diff) | |
| download | ffmpeg-b2212dec0f011893ec68eecaa990170fa24050d7.tar.gz | |
aac: Fix TNS decoding for the 512 sample window family.
Diffstat (limited to 'libavcodec/aacdec.c')
| -rw-r--r-- | libavcodec/aacdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 426a652a4c..4ed8f8f0ae 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -1178,13 +1178,14 @@ static int decode_ics_info(AACContext *ac, IndividualChannelStream *ics, if (aot == AOT_ER_AAC_LD || aot == AOT_ER_AAC_ELD) { ics->swb_offset = ff_swb_offset_512[ac->oc[1].m4ac.sampling_index]; ics->num_swb = ff_aac_num_swb_512[ac->oc[1].m4ac.sampling_index]; + ics->tns_max_bands = ff_tns_max_bands_512[ac->oc[1].m4ac.sampling_index]; if (!ics->num_swb || !ics->swb_offset) return AVERROR_BUG; } else { ics->swb_offset = ff_swb_offset_1024[ac->oc[1].m4ac.sampling_index]; ics->num_swb = ff_aac_num_swb_1024[ac->oc[1].m4ac.sampling_index]; + ics->tns_max_bands = ff_tns_max_bands_1024[ac->oc[1].m4ac.sampling_index]; } - ics->tns_max_bands = ff_tns_max_bands_1024[ac->oc[1].m4ac.sampling_index]; if (aot != AOT_ER_AAC_ELD) { ics->predictor_present = get_bits1(gb); ics->predictor_reset_group = 0; |