summaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorMatt Oliver <protogonoi@gmail.com>2015-11-11 00:13:42 +1100
committerMatt Oliver <protogonoi@gmail.com>2015-11-11 10:18:08 +1100
commit91053990602de8da4df911692710f0e8362daac9 (patch)
tree40fa5e11c3a5ecae66c59584e386ec3d136ec905 /libavutil
parent85e3c31fd54c106d45b0066e4fc3cf42d31ffb41 (diff)
downloadffmpeg-streaming-91053990602de8da4df911692710f0e8362daac9.zip
ffmpeg-streaming-91053990602de8da4df911692710f0e8362daac9.tar.gz
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@niedermayer.cc> Signed-off-by: Matt Oliver <protogonoi@gmail.com>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/x86/intmath.h2
1 files changed, 1 insertions, 1 deletions
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
OpenPOWER on IntegriCloud