diff options
author | James Almer <jamrial@gmail.com> | 2017-10-23 19:42:23 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-23 19:42:23 -0300 |
commit | 4e6c85b3bae08aa2212d93d0f7986512226fb9c7 (patch) | |
tree | 3f420e60ecd7e2f5c0a87a461e67f3c2a37f0853 | |
parent | a60fb1f88f49366df9711c729b0a33a90aba6223 (diff) | |
parent | d6390090c4dbd766b77353553d9cb4fb4fb41ebd (diff) | |
download | ffmpeg-4e6c85b3bae08aa2212d93d0f7986512226fb9c7.tar.gz |
Merge commit 'd6390090c4dbd766b77353553d9cb4fb4fb41ebd'
* commit 'd6390090c4dbd766b77353553d9cb4fb4fb41ebd':
configure: Skip check for inline assembly capabilities when explicitly disabled
Merged-by: James Almer <jamrial@gmail.com>
-rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |