[FFmpeg-cvslog] avutil/x86/intmath: Correct intrinsic headers for older compilers.

Matt Oliver git at videolan.org
Mon Nov 9 11:42:24 CET 2015


ffmpeg | branch: master | Matt Oliver <protogonoi at gmail.com> | Mon Nov  9 21:40:33 2015 +1100| [f98417451291a3ff6719d739b5e904e0b7bf404b] | committer: Matt Oliver

avutil/x86/intmath: Correct intrinsic headers for older compilers.

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

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

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

diff --git a/libavutil/x86/intmath.h b/libavutil/x86/intmath.h
index d504079..0022737 100644
--- a/libavutil/x86/intmath.h
+++ b/libavutil/x86/intmath.h
@@ -22,8 +22,12 @@
 #define AVUTIL_X86_INTMATH_H
 
 #include <stdint.h>
-#if HAVE_FAST_CLZ && (defined(__INTEL_COMPILER) || defined(_MSC_VER))
-#include <immintrin.h>
+#if HAVE_FAST_CLZ
+#if defined(_MSC_VER)
+#include <intrin.h>
+#elif defined(__INTEL_COMPILER)
+#include <x86intrin.h>
+#endif
 #endif
 #include "config.h"
 



More information about the ffmpeg-cvslog mailing list