virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

x86inc: fully concatenate tokens to fix macro expansion for nasm

Browse Source 
Fixes build errors with nasm introduced in 6f40e9f070 for stack
memory alignment. Noticed by BugMaster.
This commit is contained in:
Janne Grunau 2012-12-13 22:42:11 +01:00
parent 0eae920c3c
commit 0995ad8db4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/x86/x86inc.asm
View File

@ -153,10 +153,10 @@ CPUNOP amdnop
%define r%1mp %2 %define r%1mp %2
%elif ARCH_X86_64 ; memory %elif ARCH_X86_64 ; memory
%define r%1m [rstk + stack_offset + %3] %define r%1m [rstk + stack_offset + %3]
%define r%1mp qword r %+ %1m %define r%1mp qword r %+ %1 %+ m
%else %else
%define r%1m [rstk + stack_offset + %3] %define r%1m [rstk + stack_offset + %3]
%define r%1mp dword r %+ %1m %define r%1mp dword r %+ %1 %+ m
%endif %endif
%define r%1 %2 %define r%1 %2
%endmacro %endmacro