diff options
| author | Matt Oliver <protogonoi@gmail.com> | 2016-06-06 17:02:34 +1000 |
|---|---|---|
| committer | Matt Oliver <protogonoi@gmail.com> | 2016-06-13 13:49:24 +1000 |
| commit | 5ca44ebd99937b0038c25784570fa80d158b21fb (patch) | |
| tree | 587f0bee892ac8ec606455a70561cee042f28499 /libavutil/x86/intmath.h | |
| parent | 37787f261639c53998487400e874741c17e85fc6 (diff) | |
| download | ffmpeg-streaming-5ca44ebd99937b0038c25784570fa80d158b21fb.zip ffmpeg-streaming-5ca44ebd99937b0038c25784570fa80d158b21fb.tar.gz | |
lavu/intmath.h: fix compilation with msvc10.
Signed-off-by: Matt Oliver <protogonoi@gmail.com>
Diffstat (limited to 'libavutil/x86/intmath.h')
| -rw-r--r-- | libavutil/x86/intmath.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/x86/intmath.h b/libavutil/x86/intmath.h index f58b0d0..e83971c 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(__INTEL_COMPILER) || (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 */ |
