diff options
| author | Henrik Gramner <henrik@gramner.com> | 2017-03-29 16:43:57 +0200 |
|---|---|---|
| committer | James Darnley <jdarnley@obe.tv> | 2017-06-09 13:43:00 +0200 |
| commit | 406e0ddc0b9b5cc3867ee65924ab211be3770ed6 (patch) | |
| tree | 911e4c62eb44b3439fab0c18fe94962cb2bef157 /libavutil/x86/x86inc.asm | |
| parent | 9f20cc5c84589afe96499fd7259eb821e31217a0 (diff) | |
| download | ffmpeg-406e0ddc0b9b5cc3867ee65924ab211be3770ed6.tar.gz | |
x86inc: Fix call with memory operands
We overload the `call` instruction with a macro, but it would misbehave when
the macro argument wasn't a valid identifier. Fix it by explicitly checking
if the argument is an identifier.
Diffstat (limited to 'libavutil/x86/x86inc.asm')
| -rw-r--r-- | libavutil/x86/x86inc.asm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index 128ddc1089..c28bc8dcae 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -1,7 +1,7 @@ ;***************************************************************************** ;* x86inc.asm: x264asm abstraction layer ;***************************************************************************** -;* Copyright (C) 2005-2016 x264 project +;* Copyright (C) 2005-2017 x264 project ;* ;* Authors: Loren Merritt <lorenm@u.washington.edu> ;* Anton Mitrofanov <BugMaster@narod.ru> @@ -1037,7 +1037,11 @@ INIT_XMM ; Append cpuflags to the callee's name iff the appended name is known and the plain name isn't %macro call 1 - call_internal %1 %+ SUFFIX, %1 + %ifid %1 + call_internal %1 %+ SUFFIX, %1 + %else + call %1 + %endif %endmacro %macro call_internal 2 %xdefine %%i %2 |