diff options
| author | Diego Elio Pettenò <flameeyes@gmail.com> | 2011-01-25 01:59:36 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-26 03:43:30 +0100 |
| commit | 6b784f1b91c45921338c78a3d6813e973290e85f (patch) | |
| tree | e1ebfb513ffbc4220506cc4898b56763d7e83fc9 | |
| parent | a172126c38427bf7b72b9f66babd6261911d73f4 (diff) | |
| download | ffmpeg-streaming-6b784f1b91c45921338c78a3d6813e973290e85f.zip ffmpeg-streaming-6b784f1b91c45921338c78a3d6813e973290e85f.tar.gz | |
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 6ed3b504f984dc6cefde8d57a57726f9d30e5033)
| -rw-r--r-- | libavcodec/ac3.c | 6 | ||||
| -rw-r--r-- | libavcodec/ac3tab.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c index 0f442fa..a8b4e0b 100644 --- a/libavcodec/ac3.c +++ b/libavcodec/ac3.c @@ -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 diff --git a/libavcodec/ac3tab.c b/libavcodec/ac3tab.c index 4fc0824..7c0ebcd 100644 --- a/libavcodec/ac3tab.c +++ b/libavcodec/ac3tab.c @@ -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 */ |
