diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 18:42:58 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 18:43:46 +0400 |
| commit | a01fe55077d9627519930ad3e18d79a6682f6132 (patch) | |
| tree | c2b205aa14d0c7e32bb73d5fa6ca3f1511d1680f /libavutil/x86 | |
| parent | 2f265d9087362c17920e4bce59b21653f3fffbfe (diff) | |
| parent | c0dc57f1264dad1e121772d03abdb9e14ed8857f (diff) | |
Merge commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f'
* commit 'c0dc57f1264dad1e121772d03abdb9e14ed8857f':
asyncts: merge two conditions
x86inc: fully concatenate tokens to fix macro expansion for nasm
h264: initialize frame-mt context copies properly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86')
| -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 1f1e4b1cd7..59ddc9ddd1 100644 --- 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 |