[FFmpeg-cvslog] avutil/x86/intmath: Disable use of tzcnt on older intel compilers.

Matt Oliver git at videolan.org
Wed Nov 11 00:18:38 CET 2015


ffmpeg | branch: master | Matt Oliver <protogonoi at gmail.com> | Wed Nov 11 00:13:42 2015 +1100| [91053990602de8da4df911692710f0e8362daac9] | committer: Matt Oliver

avutil/x86/intmath: Disable use of tzcnt on older intel compilers.

ICC versions older than atleast 12.1.6 dont have the tzcnt intrinsics.

Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Matt Oliver <protogonoi at gmail.com>

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

 libavutil/x86/intmath.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/x86/intmath.h b/libavutil/x86/intmath.h
index 0022737..b3e5750 100644
--- a/libavutil/x86/intmath.h
+++ b/libavutil/x86/intmath.h
@@ -32,7 +32,7 @@
 #include "config.h"
 
 #if HAVE_FAST_CLZ
-#if defined(__INTEL_COMPILER) || defined(_MSC_VER)
+#if (defined(__INTEL_COMPILER) && (__INTEL_COMPILER>=1216)) || defined(_MSC_VER)
 #   if defined(__INTEL_COMPILER)
 #       define ff_log2(x) (_bit_scan_reverse((x)|1))
 #   else



More information about the ffmpeg-cvslog mailing list