diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-03-11 23:37:00 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-03-12 11:35:26 +0000 |
| commit | a5444fee06e9d14637396b4237d0204187a076e0 (patch) | |
| tree | 95846d9fde5d421862954982f4fc68238c49e827 | |
| parent | 4fa18c5666de24316710df670e44d4850e0796a7 (diff) | |
| download | ffmpeg-a5444fee06e9d14637396b4237d0204187a076e0.tar.gz | |
Add CONFIG_AC3DSP symbol to simplify makefiles
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | libavcodec/Makefile | 7 | ||||
| -rw-r--r-- | libavcodec/x86/Makefile | 6 |
3 files changed, 8 insertions, 9 deletions
@@ -899,6 +899,7 @@ COMPONENT_LIST=" CONFIG_LIST=" $COMPONENT_LIST aandct + ac3dsp avcodec avdevice avfilter @@ -1237,7 +1238,8 @@ aac_decoder_select="mdct rdft" aac_encoder_select="mdct" aac_latm_decoder_select="aac_decoder aac_latm_parser" ac3_decoder_select="mdct ac3_parser" -ac3_encoder_select="mdct" +ac3_encoder_select="mdct ac3dsp" +ac3_fixed_encoder_select="ac3dsp" alac_encoder_select="lpc" amrnb_decoder_select="lsp" amrwb_decoder_select="lsp" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 930affbb7a..e116a7d01c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -26,6 +26,7 @@ OBJS = allcodecs.o \ # parts needed for many different codecs OBJS-$(CONFIG_AANDCT) += aandcttab.o +OBJS-$(CONFIG_AC3DSP) += ac3dsp.o OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o OBJS-$(CONFIG_DCT) += dct.o OBJS-$(CONFIG_DWT) += dwt.o @@ -55,10 +56,8 @@ OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \ mpeg4audio.o OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o OBJS-$(CONFIG_AC3_DECODER) += ac3dec.o ac3dec_data.o ac3.o -OBJS-$(CONFIG_AC3_ENCODER) += ac3enc_float.o ac3tab.o ac3.o \ - ac3dsp.o -OBJS-$(CONFIG_AC3_FIXED_ENCODER) += ac3enc_fixed.o ac3tab.o ac3.o \ - ac3dsp.o +OBJS-$(CONFIG_AC3_ENCODER) += ac3enc_float.o ac3tab.o ac3.o +OBJS-$(CONFIG_AC3_FIXED_ENCODER) += ac3enc_fixed.o ac3tab.o ac3.o OBJS-$(CONFIG_ALAC_DECODER) += alac.o OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o OBJS-$(CONFIG_ALS_DECODER) += alsdec.o bgmc.o mpeg4audio.o diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 1b58fa121f..f8d456d3ea 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -17,10 +17,8 @@ MMX-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o YASM-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_yasm.o -MMX-OBJS-$(CONFIG_AC3_ENCODER) += x86/ac3dsp_mmx.o -MMX-OBJS-$(CONFIG_AC3_FIXED_ENCODER) += x86/ac3dsp_mmx.o -YASM-OBJS-$(CONFIG_AC3_ENCODER) += x86/ac3dsp.o -YASM-OBJS-$(CONFIG_AC3_FIXED_ENCODER) += x86/ac3dsp.o +MMX-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_mmx.o +YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o MMX-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp_mmx.o MMX-OBJS-$(CONFIG_MP1FLOAT_DECODER) += x86/mpegaudiodec_mmx.o MMX-OBJS-$(CONFIG_MP2FLOAT_DECODER) += x86/mpegaudiodec_mmx.o |