From 767d3e7bf7385f028a09096e86464da89b84a5df Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 17 Nov 2008 21:56:34 +0000 Subject: [PATCH] Revert previous commit: the libavcodec/i386/fft_*.o objects depend on libavcodec/i386/fft_mmx.o, which depends on yasm. Originally committed as revision 15866 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 60ed44838..375d24d1c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -400,11 +400,11 @@ OBJS += i386/fdct_mmx.o \ OBJS-$(CONFIG_CAVS_DECODER) += i386/cavsdsp_mmx.o OBJS-$(CONFIG_ENCODERS) += i386/dsputilenc_mmx.o -OBJS-$(CONFIG_FFT) += i386/fft_sse.o \ +OBJS-$(CONFIG_FFT_MMX) += i386/fft_mmx.o \ + i386/fft_sse.o \ i386/fft_3dn.o \ i386/fft_3dn2.o \ -OBJS-$(CONFIG_FFT_MMX) += i386/fft_mmx.o OBJS-$(CONFIG_FLAC_ENCODER) += i386/flacdsp_mmx.o OBJS-$(CONFIG_GPL) += i386/idct_mmx.o OBJS-$(CONFIG_SNOW_DECODER) += i386/snowdsp_mmx.o -- 2.11.0