diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-12-29 11:42:16 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-12-29 11:42:16 +0000 |
| commit | f1e946943ac7da6491142c2422de1ac0f26f47fe (patch) | |
| tree | c2838dde4d8efd3607f2736593f44b031927a0f5 | |
| parent | 0788ac67e04c5362e46af7751506f6a387e0d312 (diff) | |
| download | ffmpeg-f1e946943ac7da6491142c2422de1ac0f26f47fe.tar.gz | |
Declare AAC parser dependencies in configure.
This affects the AAC decoder, S/PDIF muxer and ADTS to ASC bitstream filter.
Originally committed as revision 20961 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | libavcodec/Makefile | 8 |
2 files changed, 7 insertions, 7 deletions
@@ -1083,7 +1083,7 @@ need_memalign="altivec neon sse" inline_asm_deps="!tms470" # decoders / encoders / hardware accelerators -aac_decoder_select="fft mdct" +aac_decoder_select="fft mdct aac_parser" aac_encoder_select="fft mdct" ac3_decoder_select="fft mdct" alac_encoder_select="lpc" @@ -1194,6 +1194,9 @@ zmbv_encoder_select="zlib" # parsers h264_parser_select="golomb" +# bitstream_filters +aac_adtstoasc_bsf_select="aac_parser" + # external libraries libdirac_decoder_deps="libdirac !libschroedinger" libdirac_encoder_deps="libdirac" @@ -1236,6 +1239,7 @@ psp_muxer_select="mov_muxer" rtp_muxer_deps="network rtp_protocol" rtsp_demuxer_deps="sdp_demuxer" sdp_demuxer_deps="rtp_protocol mpegts_demuxer" +spdif_muxer_select="aac_parser" tg2_muxer_select="mov_muxer" tgp_muxer_select="mov_muxer" w64_demuxer_deps="wav_demuxer" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 6a110451e6..3cf5bd47e6 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -38,8 +38,7 @@ OBJS-$(CONFIG_VAAPI) += vaapi.o 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_DECODER) += aac.o aactab.o OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \ aacpsy.o aactab.o \ psymodel.o iirfilter.o \ @@ -456,8 +455,6 @@ OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o OBJS-$(CONFIG_OGG_DEMUXER) += flacdec.o flacdata.o flac.o OBJS-$(CONFIG_OGG_MUXER) += xiph.o flacdec.o flacdata.o flac.o OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o -OBJS-$(CONFIG_SPDIF_MUXER) += aac_parser.o aac_ac3_parser.o \ - mpeg4audio.o # external codec libraries OBJS-$(CONFIG_LIBDIRAC_DECODER) += libdiracdec.o @@ -517,8 +514,7 @@ OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o vc1.o vc1data.o \ OBJS-$(CONFIG_VP3_PARSER) += vp3_parser.o # bitstream filters -OBJS-$(CONFIG_AAC_ADTSTOASC_BSF) += aac_adtstoasc_bsf.o aac_parser.o \ - aac_ac3_parser.o mpeg4audio.o +OBJS-$(CONFIG_AAC_ADTSTOASC_BSF) += aac_adtstoasc_bsf.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 |