diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-12-13 22:42:11 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2012-12-13 23:57:09 +0100 |
| commit | 0995ad8db4bca55569f8f34ef6ac10552daeae13 (patch) | |
| tree | ff2818dd6751b4079d7ce45c5c6f770c6713468c /libavutil/x86/x86inc.asm | |
| parent | 0eae920c3c49d1329ca22e5a8b5479fac354b55a (diff) | |
| download | ffmpeg-0995ad8db4bca55569f8f34ef6ac10552daeae13.tar.gz | |
x86inc: fully concatenate tokens to fix macro expansion for nasm
Fixes build errors with nasm introduced in 6f40e9f070f7 for stack
memory alignment. Noticed by BugMaster.
Diffstat (limited to 'libavutil/x86/x86inc.asm')
| -rw-r--r-- | libavutil/x86/x86inc.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index de0f22c2dc..60d05f45ae 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -153,10 +153,10 @@ CPUNOP amdnop %define r%1mp %2 %elif ARCH_X86_64 ; memory %define r%1m [rstk + stack_offset + %3] - %define r%1mp qword r %+ %1m + %define r%1mp qword r %+ %1 %+ m %else %define r%1m [rstk + stack_offset + %3] - %define r%1mp dword r %+ %1m + %define r%1mp dword r %+ %1 %+ m %endif %define r%1 %2 %endmacro |