[FFmpeg-cvslog] configure: Skip check for inline assembly capabilities when explicitly disabled

Diego Biurrun git at videolan.org
Tue Oct 24 01:44:53 EEST 2017


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Fri Mar 24 20:24:08 2017 +0100| [d6390090c4dbd766b77353553d9cb4fb4fb41ebd] | committer: Diego Biurrun

configure: Skip check for inline assembly capabilities when explicitly disabled

Otherwise inline assembly may get enabled when disabled on the command line.

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

 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 366520cf96..d9609fc51a 100755
--- a/configure
+++ b/configure
@@ -4251,7 +4251,7 @@ EOF
 sym=$($nm $TMPO | awk '/ff_extern/{ print substr($0, match($0, /[^ \t]*ff_extern/)) }')
 extern_prefix=${sym%%ff_extern*}
 
-check_inline_asm inline_asm '"" ::'
+! disabled inline_asm && check_inline_asm inline_asm '"" ::'
 
 _restrict=
 for restrict_keyword in restrict __restrict__ __restrict; do



More information about the ffmpeg-cvslog mailing list