[FFmpeg-cvslog] avutil/x86/Makefile: fix conditional x86/emms.o build

Michael Niedermayer git at videolan.org
Thu Apr 9 01:22:49 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr  9 01:01:12 2015 +0200| [d630f38f47cf468ffeb062f8d6c4efa9fcbd25f5] | committer: Michael Niedermayer

avutil/x86/Makefile: fix conditional x86/emms.o build

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d630f38f47cf468ffeb062f8d6c4efa9fcbd25f5
---

 libavutil/x86/Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/x86/Makefile b/libavutil/x86/Makefile
index 768ef85..eb70a62 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                                                  \
 



More information about the ffmpeg-cvslog mailing list