[FFmpeg-cvslog] lavu/intmath.h: fix compilation with msvc10.

Matt Oliver git at videolan.org
Mon Jun 13 05:50:18 CEST 2016


ffmpeg | branch: master | Matt Oliver <protogonoi at gmail.com> | Mon Jun  6 17:02:34 2016 +1000| [5ca44ebd99937b0038c25784570fa80d158b21fb] | committer: Matt Oliver

lavu/intmath.h: fix compilation with msvc10.

Signed-off-by: Matt Oliver <protogonoi at gmail.com>

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

 libavutil/x86/intmath.h |    2 ++
 1 file changed, 2 insertions(+)

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 */
 



More information about the ffmpeg-cvslog mailing list