From dc12f7d4ec4410455365ce1f0bf858ea9912188a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 7 Jul 2012 20:16:56 +0200 Subject: [PATCH] x86inc: try to put amdnop under ifdef to prevent compile failure based on similar amdnop usage in ffmpeg Signed-off-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 7d637a6353..08c0975780 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -604,7 +604,9 @@ SECTION .note.GNU-stack noalloc noexec nowrite progbits ; All subsequent functions (up to the next INIT_CPUFLAGS) is built for the specified cpu. ; You shouldn't need to invoke this macro directly, it's a subroutine for INIT_MMX &co. %macro INIT_CPUFLAGS 0-2 +%ifdef __YASM_VER__ CPU amdnop +%endif %if %0 >= 1 %xdefine cpuname %1 %assign cpuflags cpuflags_%1