[FFmpeg-cvslog] x86inc: fully concatenate tokens to fix macro expansion for nasm

[Janne Grunau]

ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Thu Dec 13 22:42:11 2012 +0100| [0995ad8db4bca55569f8f34ef6ac10552daeae13] | committer: Janne Grunau

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0995ad8db4bca55569f8f34ef6ac10552daeae13
---

 libavutil/x86/x86inc.asm |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm
index de0f22c..60d05f4 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