Mercurial > libavcodec.hg
changeset 11835:758c052eb8a9 libavcodec
aac: Move an initialization macro used only by the decoder out of the header.
| author | alexc |
|---|---|
| date | Sat, 05 Jun 2010 15:31:57 +0000 |
| parents | a469cc7f9edb |
| children | f71c3558f3f5 |
| files | aac.h aacdec.c |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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 <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
--- 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;