Icc 11.1 does not support attributes force_align_arg_pointer, alloc_size and cold.

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

diff --git a/libavutil/common.h b/libavutil/common.h
index 11021dc..24e9005 100644 (file)
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -74,7 +74,7 @@
 #endif
 
 #ifndef av_cold
-#if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,3)
+#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3)
 #    define av_cold __attribute__((cold))
 #else
 #    define av_cold

diff --git a/libavutil/internal.h b/libavutil/internal.h
index c9bab52..0ca2b4d 100644 (file)
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -40,7 +40,7 @@
 #include "timer.h"
 
 #ifndef attribute_align_arg
-#if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,2)
+#if (!defined(__ICC) || __ICC > 1110) && 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 8991ee9..fe18561 100644 (file)
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@ -34,7 +34,7 @@
     #define av_malloc_attrib
 #endif
 
-#if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,3)
+#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3)
     #define av_alloc_size(n) __attribute__((alloc_size(n)))
 #else
     #define av_alloc_size(n)