Commit 5ca44ebd authored by Matt Oliver's avatar Matt Oliver

lavu/intmath.h: fix compilation with msvc10.

Signed-off-by: 's avatarMatt Oliver <protogonoi@gmail.com>
parent 37787f26
...@@ -47,6 +47,7 @@ static av_always_inline av_const int ff_log2_x86(unsigned int v) ...@@ -47,6 +47,7 @@ static av_always_inline av_const int ff_log2_x86(unsigned int v)
# endif # endif
# define ff_log2_16bit av_log2 # define ff_log2_16bit av_log2
#if defined(__INTEL_COMPILER) || (defined(_MSC_VER) && (_MSC_VER >= 1700))
# define ff_ctz(v) _tzcnt_u32(v) # define ff_ctz(v) _tzcnt_u32(v)
# if ARCH_X86_64 # if ARCH_X86_64
...@@ -58,6 +59,7 @@ static av_always_inline av_const int ff_ctzll_x86(long long v) ...@@ -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); return ((uint32_t)v == 0) ? _tzcnt_u32((uint32_t)(v >> 32)) + 32 : _tzcnt_u32((uint32_t)v);
} }
# endif # endif
#endif /* _MSC_VER */
#endif /* __INTEL_COMPILER */ #endif /* __INTEL_COMPILER */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment