[FFmpeg-cvslog] Merge commit 'd6390090c4dbd766b77353553d9cb4fb4fb41ebd'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Oct 23 19:42:23 2017 -0300| [4e6c85b3bae08aa2212d93d0f7986512226fb9c7] | committer: James Almer

Merge commit 'd6390090c4dbd766b77353553d9cb4fb4fb41ebd'

* commit 'd6390090c4dbd766b77353553d9cb4fb4fb41ebd':
  configure: Skip check for inline assembly capabilities when explicitly disabled

Merged-by: James Almer <jamrial at gmail.com>

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

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

diff --git a/configure b/configure
index 98c92b2bdb..ae46567751 100755
--- a/configure
+++ b/configure
@@ -5384,7 +5384,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


======================================================================