diff options
author | Diego Biurrun <diego@biurrun.de> | 2009-02-18 23:32:41 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2009-02-18 23:32:41 +0000 |
commit | 31866c46773baac7d8b93db2941f7a630c9adb52 (patch) | |
tree | 61641485258003c2376e23ce0bb85cdc54a430ef /libavcodec | |
parent | 24a414e0fa42a0da5b3ecc80a8d5b281ddefdb24 (diff) | |
download | ffmpeg-31866c46773baac7d8b93db2941f7a630c9adb52.tar.gz |
The 3DNow! and SSE FFT optimizations depend on the yasm optimizations in
x86/fft_mmx.asm, so only build them if the latter is built.
Originally committed as revision 17440 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0f6e81322f..cd7d502813 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -402,12 +402,10 @@ OBJS-$(HAVE_PTHREADS) += pthread.o OBJS-$(HAVE_W32THREADS) += w32thread.o # processor-specific code -FFT-OBJS-$(HAVE_AMD3DNOW) += x86/fft_3dn.o -FFT-OBJS-$(HAVE_AMD3DNOWEXT) += x86/fft_3dn2.o -FFT-OBJS-$(HAVE_SSE) += x86/fft_sse.o -OBJS-$(CONFIG_FFT) += $(FFT-OBJS-yes) - -YASM-OBJS-$(CONFIG_FFT) += x86/fft_mmx.o +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 +YASM-OBJS-$(CONFIG_FFT) += x86/fft_mmx.o $(YASM-OBJS-FFT-yes) YASM-OBJS-$(CONFIG_GPL) += x86/h264_deblock_sse2.o \ x86/h264_idct_sse2.o \ |