RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-03 19:18:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix compilation with YASM.

Browse Source 
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>
This commit is contained in:
Reimar Döffinger 2011-11-20 15:02:26 +01:00
parent 03f1caec61
commit e8ab4bac0c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavutil/x86/x86inc.asm
View File

@ -469,14 +469,14 @@ DECLARE_REG 6, ebp, ebp, bp, null, [esp + stack_offset + 28]
%macro cglobal 1-2+ ; name, [PROLOGUE args] %macro cglobal 1-2+ ; name, [PROLOGUE args]
%if %0 == 1 %if %0 == 1
; HACK: work around %+ broken with empty SUFFIX for nasm 2.09.10 ; HACK: work around %+ broken with empty SUFFIX for nasm 2.09.10
%ifempty SUFFIX %ifndef cpuname
cglobal_internal %1 cglobal_internal %1
%else %else
cglobal_internal %1 %+ SUFFIX cglobal_internal %1 %+ SUFFIX
%endif %endif
%else %else
; HACK: work around %+ broken with empty SUFFIX for nasm 2.09.10 ; HACK: work around %+ broken with empty SUFFIX for nasm 2.09.10
%ifempty SUFFIX %ifndef cpuname
cglobal_internal %1, %2 cglobal_internal %1, %2
%else %else
cglobal_internal %1 %+ SUFFIX, %2 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 ; Append cpuflags to the callee's name iff the appended name is known and the plain name isn't
%macro call 1 %macro call 1
; HACK: work around %+ broken with empty SUFFIX for nasm 2.09.10 ; HACK: work around %+ broken with empty SUFFIX for nasm 2.09.10
%ifempty SUFFIX %ifndef cpuname
call_internal %1, %1 call_internal %1, %1
%else %else
call_internal %1, %1 %+ SUFFIX call_internal %1, %1 %+ SUFFIX