diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-11-20 15:02:26 +0100 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-11-20 15:03:32 +0100 |
| commit | e8ab4bac0c81ff3d6b531a6008e2f406b174452a (patch) | |
| tree | 71d88cb22eef0e8f79bacb1d59a8e20872b7aae9 | |
| parent | 03f1caec616023bd3b3e80888fec6afc94622d9f (diff) | |
| download | ffmpeg-e8ab4bac0c81ff3d6b531a6008e2f406b174452a.tar.gz | |
Fix compilation with YASM.
YASM does not support %ifempty even though it is in the official
NASM documentation and supported since NASM 2.02.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
| -rw-r--r-- | libavutil/x86/x86inc.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index 4e1eef5bb7..cdd7f18cef 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -469,14 +469,14 @@ DECLARE_REG 6, ebp, ebp, bp, null, [esp + stack_offset + 28] %macro cglobal 1-2+ ; name, [PROLOGUE args] %if %0 == 1 ; HACK: work around %+ broken with empty SUFFIX for nasm 2.09.10 - %ifempty SUFFIX + %ifndef cpuname cglobal_internal %1 %else cglobal_internal %1 %+ SUFFIX %endif %else ; HACK: work around %+ broken with empty SUFFIX for nasm 2.09.10 - %ifempty SUFFIX + %ifndef cpuname cglobal_internal %1, %2 %else cglobal_internal %1 %+ SUFFIX, %2 @@ -758,7 +758,7 @@ INIT_XMM ; Append cpuflags to the callee's name iff the appended name is known and the plain name isn't %macro call 1 ; HACK: work around %+ broken with empty SUFFIX for nasm 2.09.10 - %ifempty SUFFIX + %ifndef cpuname call_internal %1, %1 %else call_internal %1, %1 %+ SUFFIX |