Mercurial > libavcodec.hg

diff aac.c @ 9846:4cac4001dd23 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move TNS and swb_offset tables from aacdectab.h to aactab.c so that they can be shared with the AAC encoder.
author alexc
date Fri, 12 Jun 2009 21:14:45 +0000
parents d45e44454d13
children 58f97065a3a4
line wrap: on
line diff
--- a/aac.c	Fri Jun 12 17:39:56 2009 +0000
+++ b/aac.c	Fri Jun 12 21:14:45 2009 +0000
@@ -565,16 +565,16 @@
             }
         }
         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) {