diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-04-15 19:31:40 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-04-20 21:16:12 +0200 |
| commit | 9b1f776d751472e8a376b412d02a96a35044e2a0 (patch) | |
| tree | b4d3bd5ccfd6f66bf5788e1f8f3f4e65a7aff633 /libavutil | |
| parent | dd5e1fc22e5ceb7011cb3bdd5f7104d080209214 (diff) | |
| download | ffmpeg-9b1f776d751472e8a376b412d02a96a35044e2a0.tar.gz | |
Fix compilation with NASM.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/x86inc.asm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index d4f6926d08..971d210848 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -116,7 +116,11 @@ %endif ; Always use long nops (reduces 0x90 spam in disassembly on x86_32) +; Not supported by NASM (except via smartalign package + ALIGNMODE k8, +; however that fails when used together with the -M option) +%ifdef __YASM_VER__ CPU amdnop +%endif ; Macros to eliminate most code duplication between x86_32 and x86_64: ; Currently this works only for leaf functions which load all their arguments @@ -161,10 +165,10 @@ CPU amdnop %define r%1mp %2 %elif ARCH_X86_64 ; memory %define r%1m [rsp + stack_offset + %6] - %define r%1mp qword r %+ %1m + %define r%1mp qword r %+ %1 %+ m %else %define r%1m [esp + stack_offset + %6] - %define r%1mp dword r %+ %1m + %define r%1mp dword r %+ %1 %+ m %endif %define r%1 %2 %endmacro |