Merge commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8'

[ffmpeg] / libavutil / x86 / x86inc.asm

diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm
index 1f1e4b1cd7dd08556ce44bd303fac5261b3e5297..59ddc9ddd10ad433501c59844b0097163a4423ef 100644 (file)
--- a/libavutil/x86/x86inc.asm
+++ b/libavutil/x86/x86inc.asm
@@ -172,10 +172,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