[FFmpeg-cvslog] x86inc: put basicnop under ifdef to prevent compile failure.

Clément Bœsch git at videolan.org
Sat Jul 7 22:51:21 CEST 2012


ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Sat Jul  7 22:48:41 2012 +0200| [70731745515218355adb4949b92eed8e92cfad1d] | committer: Clément Bœsch

x86inc: put basicnop under ifdef to prevent compile failure.

This should fix the NASM box.

Reviewed-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavutil/x86/x86inc.asm |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm
index 08c0975..9a39df6 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



More information about the ffmpeg-cvslog mailing list