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

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19282 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavutil/common.h b/libavutil/common.h
index 11021dc8808f0dfbfcbcb30af2dbc18d3d14725a..24e900551fff3aec5fe6b43f15219d61e5c0e4fa 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 c9bab52e488e6e1bead732d914c5c5de49229b9e..0ca2b4d9837624da50d5af2dad01d9b9559f747b 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 8991ee93969a5d5eaf34e2315be255bcf7535b51..fe18561e0e1597823a98ba7a6c0f8a7b4efef06c 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)