summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-11-17 19:01:25 +0000
committerDiego Biurrun <diego@biurrun.de>2008-11-17 19:01:25 +0000
commitba01d867f5ca7aef483b4670294f2b5e32a8c03c (patch)
tree05cc2c5d593995cac6082800f24d3c6771230807
parent9168f7e671a8a07de2b9c408ce372a315f53490b (diff)
downloadffmpeg-streaming-ba01d867f5ca7aef483b4670294f2b5e32a8c03c.zip
ffmpeg-streaming-ba01d867f5ca7aef483b4670294f2b5e32a8c03c.tar.gz
Only the yasm-dependent objects should be enabled by a yasm conditional.
Originally committed as revision 15865 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 375d24d..60ed448 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_MMX) += i386/fft_mmx.o \
- i386/fft_sse.o \
+OBJS-$(CONFIG_FFT) += 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
OpenPOWER on IntegriCloud