Browse Source

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
tags/n0.8
Alex Converse 15 years ago
parent
commit
8e5998f0ab
2 changed files with 6 additions and 6 deletions
  1. +0
    -6
      libavcodec/aac.h
  2. +6
    -0
      libavcodec/aacdec.c

+ 0
- 6
libavcodec/aac.h View File

@@ -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



+ 6
- 0
libavcodec/aacdec.c View File

@@ -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;


Loading…
Cancel
Save