[FFmpeg-cvslog] configure: Ensure log2 is disable based on msvcrt version.

Matt Oliver git at videolan.org
Mon May 12 10:12:48 CEST 2014


ffmpeg | branch: master | Matt Oliver <protogonoi at gmail.com> | Mon May 12 17:35:52 2014 +1000| [4d93e758d732726fa7e20693db1f447985f1d6d8] | committer: Michael Niedermayer

configure: Ensure log2 is disable based on msvcrt version.

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

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

 configure |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index a117664..415b4ad 100755
--- a/configure
+++ b/configure
@@ -4124,9 +4124,6 @@ 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
 
@@ -5021,6 +5018,8 @@ elif enabled_any msvc icl; then
             disable ebx_available
         fi
     fi
+    # msvcrt10 x64 incorrectly enables log2, only msvcrt12 onwards actually has log2.
+    check_cpp_condition crtversion.h "_VC_CRT_MAJOR_VERSION >= 12" || disable log2
 fi
 
 case $as_type in



More information about the ffmpeg-cvslog mailing list