Intel C compiler 12.0 does not suport these attributes: may_alias, force_align_arg_po...

Originally committed as revision 25716 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/attributes.h b/libavutil/attributes.h
index a95bb02..d93f460 100644 (file)
--- a/libavutil/attributes.h
+++ b/libavutil/attributes.h
@@ -97,7 +97,7 @@
 #endif
 
 #ifndef av_alias
-#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(3,3)
+#if (!defined(__ICC) || __ICC > 1200) && AV_GCC_VERSION_AT_LEAST(3,3)
 #   define av_alias __attribute__((may_alias))
 #else
 #   define av_alias

diff --git a/libavutil/internal.h b/libavutil/internal.h
index 53d2b94..9c4ba7e 100644 (file)
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -39,7 +39,7 @@
 #include "timer.h"
 
 #ifndef attribute_align_arg
-#if ARCH_X86_32 && (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,2)
+#if ARCH_X86_32 && (!defined(__ICC) || __ICC > 1200) && AV_GCC_VERSION_AT_LEAST(4,2)
 #    define attribute_align_arg __attribute__((force_align_arg_pointer))
 #else
 #    define attribute_align_arg

diff --git a/libavutil/mem.h b/libavutil/mem.h
index c5ec2ab..1ec8eb8 100644 (file)
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@ -56,7 +56,7 @@
     #define av_malloc_attrib
 #endif
 
-#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3)
+#if (!defined(__ICC) || __ICC > 1200) && AV_GCC_VERSION_AT_LEAST(4,3)
     #define av_alloc_size(n) __attribute__((alloc_size(n)))
 #else
     #define av_alloc_size(n)