From 31866c46773baac7d8b93db2941f7a630c9adb52 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 18 Feb 2009 23:32:41 +0000 Subject: [PATCH] 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 --- libavcodec/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0f6e813..cd7d502 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 \ -- 2.7.4