diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-05-25 19:02:35 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-05-25 19:02:35 +0000 |
| commit | cc013a74232837817d74bb3c44ac7deacc11d635 (patch) | |
| tree | bc4150f11ff1f110407940ca37d4a1632f0d6db3 | |
| parent | 07116be05a11c02adfe6b2f09b38e0e3438b8211 (diff) | |
| download | ffmpeg-cc013a74232837817d74bb3c44ac7deacc11d635.tar.gz | |
The MLP optimizations do not depend on HAVE_MMX, but on ARCH_X86.
Build them when ARCH_X86 is enabled. Fixes linking with MMX disabled.
Originally committed as revision 18945 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 7 |
2 files changed, 6 insertions, 3 deletions
@@ -46,7 +46,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF) $(STRIP) $@ SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES \ - ALTIVEC-OBJS MMX-OBJS NEON-OBJS YASM-OBJS-FFT YASM-OBJS + ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS define RESET $(1) := diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 69bd93d1d4..9ca3308545 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -434,6 +434,11 @@ OBJS-$(HAVE_PTHREADS) += pthread.o OBJS-$(HAVE_W32THREADS) += w32thread.o # processor-specific code +X86-OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o +X86-OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o + +OBJS-$(ARCH_X86) += $(X86-OBJS-yes) + YASM-OBJS-FFT-$(HAVE_AMD3DNOW) += x86/fft_3dn.o YASM-OBJS-FFT-$(HAVE_AMD3DNOWEXT) += x86/fft_3dn2.o YASM-OBJS-FFT-$(HAVE_SSE) += x86/fft_sse.o @@ -445,10 +450,8 @@ MMX-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp_mmx.o MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o MMX-OBJS-$(CONFIG_FLAC_ENCODER) += x86/flacdsp_mmx.o MMX-OBJS-$(CONFIG_GPL) += x86/idct_mmx.o -MMX-OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o MMX-OBJS-$(CONFIG_SNOW_DECODER) += x86/snowdsp_mmx.o MMX-OBJS-$(CONFIG_THEORA_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o -MMX-OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o MMX-OBJS-$(CONFIG_VP3_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o |