From 6ed3b504f984dc6cefde8d57a57726f9d30e5033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
Date: Tue, 25 Jan 2011 01:59:36 +0000
Subject: [PATCH] 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>
---
libavcodec/ac3.c | 6 ++++++
libavcodec/ac3tab.c | 5 -----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c
index 0f442fa487c..a8b4e0b268e 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 4fc0824a46a..7c0ebcdcd3c 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
*/
--
GitLab