From: Alex Converse <alex.converse@gmail.com>
Date: Sat, 5 Jun 2010 15:31:57 +0000 (+0000)
Subject: aac: Move an initialization macro used only by the decoder out of the header.
X-Git-Tag: v0.7b1~3884
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e5998f0ab1bdef63d8c69473212a3558f5cc0fa;p=platform%2Fupstream%2Flibav.git

aac: Move an initialization macro used only by the decoder out of the header.

Originally committed as revision 23490 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/aac.h b/libavcodec/aac.h
index ff0e8cb..f74cb51 100644
--- a/libavcodec/aac.h
+++ b/libavcodec/aac.h
@@ -38,12 +38,6 @@
 
 #include <stdint.h>
 
-#define AAC_INIT_VLC_STATIC(num, size) \
-    INIT_VLC_STATIC(&vlc_spectral[num], 8, ff_aac_spectral_sizes[num], \
-         ff_aac_spectral_bits[num], sizeof( ff_aac_spectral_bits[num][0]), sizeof( ff_aac_spectral_bits[num][0]), \
-        ff_aac_spectral_codes[num], sizeof(ff_aac_spectral_codes[num][0]), sizeof(ff_aac_spectral_codes[num][0]), \
-        size);
-
 #define MAX_CHANNELS 64
 #define MAX_ELEM_ID 16
 
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index ebbc4cd..ba84678 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -524,6 +524,12 @@ static void reset_predictor_group(PredictorState *ps, int group_num)
         reset_predict_state(&ps[i]);
 }
 
+#define AAC_INIT_VLC_STATIC(num, size) \
+    INIT_VLC_STATIC(&vlc_spectral[num], 8, ff_aac_spectral_sizes[num], \
+         ff_aac_spectral_bits[num], sizeof( ff_aac_spectral_bits[num][0]), sizeof( ff_aac_spectral_bits[num][0]), \
+        ff_aac_spectral_codes[num], sizeof(ff_aac_spectral_codes[num][0]), sizeof(ff_aac_spectral_codes[num][0]), \
+        size);
+
 static av_cold int aac_decode_init(AVCodecContext *avctx)
 {
     AACContext *ac = avctx->priv_data;