summaryrefslogtreecommitdiff
path: root/libavcodec/Makefile
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-11-17 21:56:34 +0000
committerDiego Biurrun <diego@biurrun.de>2008-11-17 21:56:34 +0000
commit767d3e7bf7385f028a09096e86464da89b84a5df (patch)
tree7f8b4a4411e8e185139e7fdf75e0325dfea86cc0 /libavcodec/Makefile
parentba01d867f5ca7aef483b4670294f2b5e32a8c03c (diff)
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
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r--libavcodec/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 60ed448384..375d24d1cb 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