[FFmpeg-cvslog] x86: fix rNmp macros with nasm

Mans Rullgard git at videolan.org
Tue Aug 7 23:09:27 CEST 2012


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Mon Aug  6 00:21:36 2012 +0100| [7238265052d3b7ec1aa61d6ddc72aa1910c22725] | committer: Mans Rullgard

x86: fix rNmp macros with nasm

For some reason, nasm requires this.  No harm done to yasm.

Signed-off-by: Mans Rullgard <mans at mansr.com>

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

 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 03e6c07..86c406f 100644
--- a/libavutil/x86/x86inc.asm
+++ b/libavutil/x86/x86inc.asm
@@ -139,10 +139,10 @@ CPU amdnop
         %define r%1mp %2
     %elif ARCH_X86_64 ; memory
         %define r%1m [rsp + stack_offset + %3]
-        %define r%1mp qword r %+ %1m
+        %define r%1mp qword r %+ %1 %+ m
     %else
         %define r%1m [esp + stack_offset + %3]
-        %define r%1mp dword r %+ %1m
+        %define r%1mp dword r %+ %1 %+ m
     %endif
     %define r%1  %2
 %endmacro



More information about the ffmpeg-cvslog mailing list