[FFmpeg-cvslog] r23490 - in trunk/libavcodec: aac.h aacdec.c
alexc
subversion
Sat Jun 5 17:31:57 CEST 2010
Author: alexc
Date: Sat Jun 5 17:31:57 2010
New Revision: 23490
Log:
aac: Move an initialization macro used only by the decoder out of the header.
Modified:
trunk/libavcodec/aac.h
trunk/libavcodec/aacdec.c
Modified: trunk/libavcodec/aac.h
==============================================================================
--- trunk/libavcodec/aac.h Sat Jun 5 17:27:53 2010 (r23489)
+++ trunk/libavcodec/aac.h Sat Jun 5 17:31:57 2010 (r23490)
@@ -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
Modified: trunk/libavcodec/aacdec.c
==============================================================================
--- trunk/libavcodec/aacdec.c Sat Jun 5 17:27:53 2010 (r23489)
+++ trunk/libavcodec/aacdec.c Sat Jun 5 17:31:57 2010 (r23490)
@@ -524,6 +524,12 @@ static void reset_predictor_group(Predic
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;
More information about the ffmpeg-cvslog
mailing list