From a0d294526f53281644c785b077534b9634d8a985 Mon Sep 17 00:00:00 2001 From: Matt Oliver Date: Mon, 6 Jun 2016 17:02:34 +1000 Subject: [PATCH] lavu/intmath.h: fix compilation with msvc10. --- libavutil/x86/intmath.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/x86/intmath.h b/libavutil/x86/intmath.h index f58b0d0..de177dd 100644 --- a/libavutil/x86/intmath.h +++ b/libavutil/x86/intmath.h @@ -47,6 +47,7 @@ static av_always_inline av_const int ff_log2_x86(unsigned int v) # endif # define ff_log2_16bit av_log2 +#if defined(_MSC_VER) && (_MSC_VER >= 1700) # define ff_ctz(v) _tzcnt_u32(v) # if ARCH_X86_64 @@ -58,6 +59,7 @@ static av_always_inline av_const int ff_ctzll_x86(long long v) return ((uint32_t)v == 0) ? _tzcnt_u32((uint32_t)(v >> 32)) + 32 : _tzcnt_u32((uint32_t)v); } # endif +#endif /* _MSC_VER */ #endif /* __INTEL_COMPILER */ -- 2.8.1.windows.1