@@ -1050,6 +1050,7 @@ inline_asm_deps="!tms470"

 # decoders / encoders / hardware accelerators

 aac_decoder_select="fft mdct"

+aac_encoder_select="fft mdct"

 ac3_decoder_select="fft mdct"

 atrac3_decoder_select="fft mdct"

 cavs_decoder_select="golomb"

@@ -1059,6 +1060,7 @@ dca_decoder_select="fft mdct"

 dnxhd_encoder_select="aandct"

 dxa_decoder_select="zlib"

 eac3_decoder_select="ac3_decoder"

+eamad_decoder_select="aandct"

 eatgq_decoder_select="aandct"

 eatqi_decoder_select="aandct"

 ffv1_decoder_select="golomb"

@@ -36,9 +36,9 @@ OBJS-$(CONFIG_VDPAU)                   += vdpau.o

 # decoders/encoders/hardware accelerators

 OBJS-$(CONFIG_AAC_DECODER)             += aac.o aactab.o mpeg4audio.o aac_parser.o aac_ac3_parser.o

-OBJS-$(CONFIG_AAC_ENCODER)             += aacenc.o aaccoder.o aacpsy.o aactab.o psymodel.o iirfilter.o mdct.o fft.o mpeg4audio.o

+OBJS-$(CONFIG_AAC_ENCODER)             += aacenc.o aaccoder.o aacpsy.o aactab.o psymodel.o iirfilter.o mpeg4audio.o

 OBJS-$(CONFIG_AASC_DECODER)            += aasc.o msrledec.o

-OBJS-$(CONFIG_AC3_DECODER)             += ac3dec.o ac3tab.o ac3dec_data.o ac3.o

+OBJS-$(CONFIG_AC3_DECODER)             += ac3dec.o ac3tab.o ac3dec_data.o ac3.o ac3_parser.o aac_ac3_parser.o

 OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc.o ac3tab.o ac3.o

 OBJS-$(CONFIG_ALAC_DECODER)            += alac.o

 OBJS-$(CONFIG_ALAC_ENCODER)            += alacenc.o lpc.o

@@ -77,7 +77,7 @@ OBJS-$(CONFIG_DVVIDEO_ENCODER)         += dv.o

 OBJS-$(CONFIG_DXA_DECODER)             += dxa.o

 OBJS-$(CONFIG_EAC3_DECODER)            += eac3dec.o eac3dec_data.o

 OBJS-$(CONFIG_EACMV_DECODER)           += eacmv.o

-OBJS-$(CONFIG_EAMAD_DECODER)           += eamad.o eaidct.o

+OBJS-$(CONFIG_EAMAD_DECODER)           += eamad.o eaidct.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o

 OBJS-$(CONFIG_EATGQ_DECODER)           += eatgq.o eaidct.o

 OBJS-$(CONFIG_EATGV_DECODER)           += eatgv.o

 OBJS-$(CONFIG_EATQI_DECODER)           += eatqi.o eaidct.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o

@@ -417,7 +417,7 @@ OBJS-$(CONFIG_VC1_PARSER)              += vc1_parser.o vc1.o vc1data.o msmpeg4da

 OBJS-$(CONFIG_VP3_PARSER)              += vp3_parser.o

 # bitstream filters

-OBJS-$(CONFIG_AAC_ADTSTOASC_BSF)          += aac_adtstoasc_bsf.o aac_parser.o mpeg4audio.o

+OBJS-$(CONFIG_AAC_ADTSTOASC_BSF)          += aac_adtstoasc_bsf.o aac_parser.o aac_ac3_parser.o mpeg4audio.o

 OBJS-$(CONFIG_DUMP_EXTRADATA_BSF)         += dump_extradata_bsf.o

 OBJS-$(CONFIG_H264_MP4TOANNEXB_BSF)       += h264_mp4toannexb_bsf.o

 OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF)        += imx_dump_header_bsf.o

@@ -52,7 +52,7 @@ OBJS-$(CONFIG_EAC3_DEMUXER)              += raw.o id3v2.o

 OBJS-$(CONFIG_EAC3_MUXER)                += raw.o

 OBJS-$(CONFIG_FFM_DEMUXER)               += ffmdec.o

 OBJS-$(CONFIG_FFM_MUXER)                 += ffmenc.o

-OBJS-$(CONFIG_FLAC_DEMUXER)              += flacdec.o raw.o id3v2.o oggparsevorbis.o

+OBJS-$(CONFIG_FLAC_DEMUXER)              += flacdec.o raw.o id3v1.o id3v2.o oggparsevorbis.o

 OBJS-$(CONFIG_FLAC_MUXER)                += flacenc.o

 OBJS-$(CONFIG_FLIC_DEMUXER)              += flic.o

 OBJS-$(CONFIG_FLV_DEMUXER)               += flvdec.o

@@ -92,10 +92,10 @@ OBJS-$(CONFIG_MMF_DEMUXER)               += mmf.o raw.o

 OBJS-$(CONFIG_MMF_MUXER)                 += mmf.o riff.o

 OBJS-$(CONFIG_MOV_DEMUXER)               += mov.o riff.o isom.o

 OBJS-$(CONFIG_MOV_MUXER)                 += movenc.o riff.o isom.o avc.o

-OBJS-$(CONFIG_MP2_MUXER)                 += mp3.o

+OBJS-$(CONFIG_MP2_MUXER)                 += mp3.o id3v1.o

 OBJS-$(CONFIG_MP3_DEMUXER)               += mp3.o id3v1.o id3v2.o

-OBJS-$(CONFIG_MP3_MUXER)                 += mp3.o

-OBJS-$(CONFIG_MPC_DEMUXER)               += mpc.o id3v2.o

+OBJS-$(CONFIG_MP3_MUXER)                 += mp3.o id3v1.o

+OBJS-$(CONFIG_MPC_DEMUXER)               += mpc.o id3v1.o id3v2.o

 OBJS-$(CONFIG_MPC8_DEMUXER)              += mpc8.o

 OBJS-$(CONFIG_MPEG1SYSTEM_MUXER)         += mpegenc.o

 OBJS-$(CONFIG_MPEG1VCD_MUXER)            += mpegenc.o

@@ -197,7 +197,7 @@ OBJS-$(CONFIG_SHORTEN_DEMUXER)           += raw.o id3v2.o

 OBJS-$(CONFIG_SIFF_DEMUXER)              += siff.o

 OBJS-$(CONFIG_SMACKER_DEMUXER)           += smacker.o

 OBJS-$(CONFIG_SOL_DEMUXER)               += sol.o raw.o

-OBJS-$(CONFIG_SOX_DEMUXER)               += soxdec.o

+OBJS-$(CONFIG_SOX_DEMUXER)               += soxdec.o raw.o

 OBJS-$(CONFIG_SOX_MUXER)                 += soxenc.o

 OBJS-$(CONFIG_STR_DEMUXER)               += psxstr.o

 OBJS-$(CONFIG_SWF_DEMUXER)               += swfdec.o