RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move ff_ac3_critical_band_size_tab in ac3.c for non-hardcoded tables. 

This symbol is only ever used to calculate the non-hardcoded tables, so
only enable it in that case, and static to the source unit that uses it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6ed3b504f9)
This commit is contained in:
Diego Elio Pettenò 2011-01-25 01:59:36 +00:00 committed by Michael Niedermayer
parent a172126c38
commit 6b784f1b91
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/ac3.c
View File

@ -70,6 +70,12 @@ static const uint8_t bin_to_band_tab[253] = {
};
#else /* CONFIG_HARDCODED_TABLES */
static const uint8_t ff_ac3_critical_band_size_tab[AC3_CRITICAL_BANDS]={
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3,
3, 6, 6, 6, 6, 6, 6, 12, 12, 12, 12, 24, 24, 24, 24, 24
};
static uint8_t band_start_tab[51];
static uint8_t bin_to_band_tab[253];
#endif

5
libavcodec/ac3tab.c
View File

@ -292,11 +292,6 @@ const uint16_t ff_ac3_fast_gain_tab[8]= {
0x080, 0x100, 0x180, 0x200, 0x280, 0x300, 0x380, 0x400,
};
const uint8_t ff_ac3_critical_band_size_tab[AC3_CRITICAL_BANDS]={
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3,
3, 6, 6, 6, 6, 6, 6, 12, 12, 12, 12, 24, 24, 24, 24, 24
};
/**
* Default channel map for a dependent substream defined by acmod
*/