[FFmpeg-cvslog] configure: Allow log2 with msvc12 onwards.

Matt Oliver git at videolan.org
Mon May 12 04:11:16 CEST 2014


ffmpeg | branch: master | Matt Oliver <protogonoi at gmail.com> | Sun May 11 17:40:20 2014 +1000| [3b2ab8a78306633db75bba2522a56cd4d5dfb458] | committer: Michael Niedermayer

configure: Allow log2 with msvc12 onwards.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 configure |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 7f4ce39..a117664 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
 



More information about the ffmpeg-cvslog mailing list