diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2012-07-07 22:48:41 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2012-07-07 22:48:43 +0200 |
| commit | 70731745515218355adb4949b92eed8e92cfad1d (patch) | |
| tree | ecbf051f3fea092aab203b8837a68491827200d6 | |
| parent | 68712ce8201b590192eb5fdda8e0a9d202f1feca (diff) | |
| download | ffmpeg-70731745515218355adb4949b92eed8e92cfad1d.tar.gz | |
x86inc: put basicnop under ifdef to prevent compile failure.
This should fix the NASM box.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/x86/x86inc.asm | 2 |
1 files changed, 2 insertions, 0 deletions
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 |