Signed-off-by: James Almer <jamr...@gmail.com>
---
Now making sure it's not used with ICC.
libavutil/x86/intmath.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/libavutil/x86/intmath.h b/libavutil/x86/intmath.h
index c42fa83..8127e10 100644
--- a/libavutil/x86/intmath.h
+++ b/libavutil/x86/intmath.h
@@ -39,6 +39,12 @@
#if defined(__BMI2__)
+#if AV_GCC_VERSION_AT_LEAST(5,1) && !defined(__INTEL_COMPILER)
+#define av_mod_uintp2 __builtin_ia32_bzhi_si
+#else
+/* GCC releases before 5.1.0 have a broken bzhi builtin, so for those we
+ * implement it using inline assembly
+ */
#define av_mod_uintp2 av_mod_uintp2_bmi2
static av_always_inline av_const unsigned av_mod_uintp2_bmi2(unsigned a,
unsigned p)
{
@@ -50,6 +56,7 @@ static av_always_inline av_const unsigned
av_mod_uintp2_bmi2(unsigned a, unsigne
return x;
}
}
+#endif /* AV_GCC_VERSION_AT_LEAST */
#endif /* __BMI2__ */
--
2.4.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
