aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Oliver <protogonoi@gmail.com>2014-05-11 17:40:20 +1000
committerMichael Niedermayer <michaelni@gmx.at>2014-05-12 03:46:50 +0200
commit3b2ab8a78306633db75bba2522a56cd4d5dfb458 (patch)
tree9955f47016a1f53dda2965ea1bb52e3b025fcbae
parent96abdf2ffd7df3212d98036c23be4c01378694e8 (diff)
downloadffmpeg-3b2ab8a78306633db75bba2522a56cd4d5dfb458.tar.gz
configure: Allow log2 with msvc12 onwards.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-xconfigure4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index 7f4ce39966..a1176645a2 100755
--- a/configure
+++ b/configure
@@ -1956,7 +1956,6 @@ fast_unaligned_if_any="aarch64 ppc x86"
need_memalign="altivec neon sse"
# system capabilities
-log2_deps="!libc_msvcrt"
symver_if_any="symver_asm_label symver_gnu_asm"
@@ -4125,6 +4124,9 @@ case $libc_type in
add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf \
_snprintf=avpriv_snprintf \
vsnprintf=avpriv_vsnprintf
+ # MSVC 2010 x64 requires log2 fix. However 2013 onwards is supported.
+ check_cpp_condition stdlib.h "_MSC_VER >= 1800" ||
+ disable log2
;;
esac