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

[Matt Oliver]

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

--
-------------- next part --------------
A non-text attachment was scrubbed...
Name: lavu-intmath.h-fix-compilation-with-msvc10.patch
Type: application/octet-stream
Size: 939 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160606/e0a12cde/attachment.obj>