aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-09 01:01:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-09 01:12:51 +0200
commitd630f38f47cf468ffeb062f8d6c4efa9fcbd25f5 (patch)
tree2e785a4072587631f07b33407ae4bf83ec04cccb
parente88b3852aefaa39b2170ef185ad03dda18732821 (diff)
downloadffmpeg-d630f38f47cf468ffeb062f8d6c4efa9fcbd25f5.tar.gz
avutil/x86/Makefile: fix conditional x86/emms.o build
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/x86/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/x86/Makefile b/libavutil/x86/Makefile
index 768ef85e1f..eb70a62eaa 100644
--- a/libavutil/x86/Makefile
+++ b/libavutil/x86/Makefile
@@ -4,10 +4,10 @@ OBJS += x86/cpu.o \
OBJS-$(CONFIG_PIXELUTILS) += x86/pixelutils_init.o \
-EMMS_OBJS_$(HAVE_INLINE_MMX)_$(HAVE_EXTERNAL_MMX)_$(HAVE_MM_EMPTY) = x86/emms.o
+EMMS_OBJS_$(HAVE_MMX_INLINE)_$(HAVE_MMX_EXTERNAL)_$(HAVE_MM_EMPTY) = x86/emms.o
YASM-OBJS += x86/cpuid.o \
- $(EMMS_OBJS_NO_NO_NO) \
+ $(EMMS_OBJS__yes_) \
x86/float_dsp.o \
x86/lls.o \