diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-04 14:36:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-04 14:36:58 +0200 |
| commit | 9d8e8495c9d733dd9004b26da9c73fddba7c14e5 (patch) | |
| tree | a2e69a673387b57f9c4f1025e42fea9266e59933 | |
| parent | 74b2b0ed9fc3d74cc19696121dd09f3e8ca25e31 (diff) | |
| parent | 6cc133ec58b829e5535ebfc5294ebadedcdb3adb (diff) | |
| download | ffmpeg-9d8e8495c9d733dd9004b26da9c73fddba7c14e5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: fdct: Only build fdct code if encoders have been enabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 0a6bab885c..694e186d5f 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -8,6 +8,7 @@ OBJS-$(CONFIG_DCT) += x86/dct_init.o OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o OBJS-$(CONFIG_DSPUTIL) += x86/dsputil_init.o OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o \ + x86/fdct.o \ x86/motion_est.o OBJS-$(CONFIG_FFT) += x86/fft_init.o OBJS-$(CONFIG_H264CHROMA) += x86/h264chroma_init.o @@ -39,7 +40,6 @@ OBJS-$(CONFIG_WEBP_DECODER) += x86/vp8dsp_init.o OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o MMX-OBJS-$(CONFIG_DSPUTIL) += x86/dsputil_mmx.o \ - x86/fdct.o \ x86/fpel_mmx.o \ x86/idct_mmx_xvid.o \ x86/idct_sse2_xvid.o \ |