[libav-devel] [PATCH] mpegaudioenc: Move some static tables to the only place they are used

Diego Biurrun diego at biurrun.de
Mon Nov 4 21:24:11 CET 2013


---
 libavcodec/mpegaudioenc.c |   14 ++++++++++++++
 libavcodec/mpegaudiotab.h |   14 --------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c
index 739eb64..7e0fda5 100644
--- a/libavcodec/mpegaudioenc.c
+++ b/libavcodec/mpegaudioenc.c
@@ -67,6 +67,20 @@ typedef struct MpegAudioContext {
 #include "mpegaudiodata.h"
 #include "mpegaudiotab.h"
 
+static int16_t filter_bank[512];
+static int scale_factor_table[64];
+static unsigned char scale_diff_table[128];
+
+#ifdef USE_FLOATS
+static float scale_factor_inv_table[64];
+#else
+static int8_t scale_factor_shift[64];
+static unsigned short scale_factor_mult[64];
+#endif
+
+/* total number of bits per allocation group */
+static unsigned short total_quant_bits[17];
+
 static av_cold int MPA_encode_init(AVCodecContext *avctx)
 {
     MpegAudioContext *s = avctx->priv_data;
diff --git a/libavcodec/mpegaudiotab.h b/libavcodec/mpegaudiotab.h
index 45afe9b..d30ef1b 100644
--- a/libavcodec/mpegaudiotab.h
+++ b/libavcodec/mpegaudiotab.h
@@ -79,20 +79,6 @@ static const int bitinv32[32] = {
 };
 
 
-static int16_t filter_bank[512];
-
-static int scale_factor_table[64];
-#ifdef USE_FLOATS
-static float scale_factor_inv_table[64];
-#else
-static int8_t scale_factor_shift[64];
-static unsigned short scale_factor_mult[64];
-#endif
-static unsigned char scale_diff_table[128];
-
-/* total number of bits per allocation group */
-static unsigned short total_quant_bits[17];
-
 /* signal to noise ratio of each quantification step (could be
    computed from quant_steps[]). The values are dB multiplied by 10
 */
-- 
1.7.9.5



More information about the libav-devel mailing list