# HG changeset patch # User alexc # Date 1275751917 0 # Node ID 758c052eb8a9989ee6dade4d4efed7dee6f76504 # Parent a469cc7f9edb7d664b0ae7a110cd10dd3e393472 aac: Move an initialization macro used only by the decoder out of the header. diff -r a469cc7f9edb -r 758c052eb8a9 aac.h --- a/aac.h Sat Jun 05 15:27:53 2010 +0000 +++ b/aac.h Sat Jun 05 15:31:57 2010 +0000 @@ -38,12 +38,6 @@ #include -#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 -r a469cc7f9edb -r 758c052eb8a9 aacdec.c --- a/aacdec.c Sat Jun 05 15:27:53 2010 +0000 +++ b/aacdec.c Sat Jun 05 15:31:57 2010 +0000 @@ -524,6 +524,12 @@ 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;