diff options
| author | Alex Converse <alex.converse@gmail.com> | 2009-06-12 21:14:45 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2009-06-12 21:14:45 +0000 |
| commit | 85e9296f415c3349207cb0834ed28e8889d148ef (patch) | |
| tree | 8ad7c728928577b97ba1a4c1d44d640ae6d05729 /libavcodec/aac.c | |
| parent | 70f99f8dd229daa33f6c251528cf02947e4e6419 (diff) | |
| download | ffmpeg-85e9296f415c3349207cb0834ed28e8889d148ef.tar.gz | |
Move TNS and swb_offset tables from aacdectab.h to aactab.c so that they can be
shared with the AAC encoder.
Originally committed as revision 19174 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aac.c')
| -rw-r--r-- | libavcodec/aac.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/aac.c b/libavcodec/aac.c index 50429cf0ff..1c53ccf8bf 100644 --- a/libavcodec/aac.c +++ b/libavcodec/aac.c @@ -565,16 +565,16 @@ static int decode_ics_info(AACContext * ac, IndividualChannelStream * ics, GetBi } } ics->num_windows = 8; - ics->swb_offset = swb_offset_128[ac->m4ac.sampling_index]; + ics->swb_offset = ff_swb_offset_128[ac->m4ac.sampling_index]; ics->num_swb = ff_aac_num_swb_128[ac->m4ac.sampling_index]; - ics->tns_max_bands = tns_max_bands_128[ac->m4ac.sampling_index]; + ics->tns_max_bands = ff_tns_max_bands_128[ac->m4ac.sampling_index]; ics->predictor_present = 0; } else { ics->max_sfb = get_bits(gb, 6); ics->num_windows = 1; - ics->swb_offset = swb_offset_1024[ac->m4ac.sampling_index]; + ics->swb_offset = ff_swb_offset_1024[ac->m4ac.sampling_index]; ics->num_swb = ff_aac_num_swb_1024[ac->m4ac.sampling_index]; - ics->tns_max_bands = tns_max_bands_1024[ac->m4ac.sampling_index]; + ics->tns_max_bands = ff_tns_max_bands_1024[ac->m4ac.sampling_index]; ics->predictor_present = get_bits1(gb); ics->predictor_reset_group = 0; if (ics->predictor_present) { |