aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2010-06-05 15:31:57 +0000
committerAlex Converse <alex.converse@gmail.com>2010-06-05 15:31:57 +0000
commit8e5998f0ab1bdef63d8c69473212a3558f5cc0fa (patch)
tree0defccefdf779c3871e8c919a7c40c72d5c6700d /libavcodec
parent77b8320a4d178eafa5f0a02bd84d5cfb1d43f008 (diff)
downloadffmpeg-8e5998f0ab1bdef63d8c69473212a3558f5cc0fa.tar.gz
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
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/aac.h6
-rw-r--r--libavcodec/aacdec.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h
index ff0e8cb2a7..f74cb51429 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 ebbc4cd205..ba84678aa8 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;