From 70731745515218355adb4949b92eed8e92cfad1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Sat, 7 Jul 2012 22:48:41 +0200 Subject: [PATCH] x86inc: put basicnop under ifdef to prevent compile failure. This should fix the NASM box. Reviewed-by: Michael Niedermayer --- libavutil/x86/x86inc.asm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index 08c0975780..9a39df6ec8 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -628,9 +628,11 @@ SECTION .note.GNU-stack noalloc noexec nowrite progbits %elifidn %1, sse3 %define movu lddqu %endif + %ifdef __YASM_VER__ %if notcpuflag(mmx2) CPU basicnop %endif + %endif %else %xdefine SUFFIX %undef cpuname