[FFmpeg-cvslog] x86inc: Fix call with memory operands
Henrik Gramner
git at videolan.org
Fri Jun 9 14:50:08 EEST 2017
ffmpeg | branch: master | Henrik Gramner <henrik at gramner.com> | Wed Mar 29 16:43:57 2017 +0200| [406e0ddc0b9b5cc3867ee65924ab211be3770ed6] | committer: James Darnley
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.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=406e0ddc0b9b5cc3867ee65924ab211be3770ed6
---
libavutil/x86/x86inc.asm | 8 ++++++--
1 file 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 at u.washington.edu>
;* Anton Mitrofanov <BugMaster at 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
More information about the ffmpeg-cvslog
mailing list