aac: move aacdec.c to aac/aacdec.c

libavcodec/Makefile

@@ -180,7 +180,7 @@ OBJS-$(CONFIG_WMV2DSP)                 += wmv2dsp.o
 OBJS-$(CONFIG_ZERO12V_DECODER)         += 012v.o
 OBJS-$(CONFIG_A64MULTI_ENCODER)        += a64multienc.o elbg.o
 OBJS-$(CONFIG_A64MULTI5_ENCODER)       += a64multienc.o elbg.o
-OBJS-$(CONFIG_AAC_DECODER)             += aacdec.o aactab.o \
+OBJS-$(CONFIG_AAC_DECODER)             += aactab.o \
                                           aacsbr.o aacps_common.o aacps_float.o \
                                           kbdwin.o \
                                           sbrdsp.o aacpsdsp_float.o cbrt_data.o

libavcodec/aac/aacdec.h

@@ -339,10 +339,11 @@ struct AACDecContext {
 #define fdsp          RENAME_FIXED(fdsp)
 #endif
 
-extern const struct AVClass ff_aac_decoder_class;
+extern const AACDecDSP aac_dsp;
+extern const AACDecDSP aac_dsp_fixed;
 
-int ff_aac_decode_init_common(struct AVCodecContext *avctx);
-int ff_aac_decode_close(struct AVCodecContext *avctx);
+extern const AACDecProc aac_proc;
+extern const AACDecProc aac_proc_fixed;
 
 void ff_aacdec_init_mips(AACDecContext *c);
 

libavcodec/aac/aacdec_latm.h

@@ -335,7 +335,7 @@ const FFCodec ff_aac_latm_decoder = {
     .p.id            = AV_CODEC_ID_AAC_LATM,
     .priv_data_size  = sizeof(struct LATMContext),
     .init            = latm_decode_init,
-    .close           = ff_aac_decode_close,
+    .close           = decode_close,
     FF_CODEC_DECODE_CB(latm_decode_frame),
     .p.sample_fmts   = (const enum AVSampleFormat[]) {
         AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE