From 103cced2000bda191a15127710c2406439476d3c Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Tue, 17 Nov 2015 18:01:04 +1100 Subject: [PATCH] avutil/x86/intmath: Fix compilation with clang on windows. Signed-off-by: Matt Oliver --- libavutil/x86/intmath.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/x86/intmath.h b/libavutil/x86/intmath.h index 611ef88..5787a56 100644 --- a/libavutil/x86/intmath.h +++ b/libavutil/x86/intmath.h @@ -32,7 +32,7 @@ #include "config.h" #if HAVE_FAST_CLZ -#if (defined(__INTEL_COMPILER) && (__INTEL_COMPILER>=1216)) || defined(_MSC_VER) +#if (defined(__INTEL_COMPILER) && (__INTEL_COMPILER>=1216)) || (defined(_MSC_VER) && !defined(__clang__)) # if defined(__INTEL_COMPILER) # define ff_log2(x) (_bit_scan_reverse((x)|1)) # else -- 1.9.5.github.0