[FFmpeg-cvslog] r19282 - in trunk/libavutil: common.h internal.h mem.h

[cehoyos]

Author: cehoyos
Date: Sat Jun 27 10:34:04 2009
New Revision: 19282

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

Modified:
   trunk/libavutil/common.h
   trunk/libavutil/internal.h
   trunk/libavutil/mem.h

Modified: trunk/libavutil/common.h
==============================================================================
--- trunk/libavutil/common.h	Fri Jun 26 19:43:05 2009	(r19281)
+++ trunk/libavutil/common.h	Sat Jun 27 10:34:04 2009	(r19282)
@@ -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

Modified: trunk/libavutil/internal.h
==============================================================================
--- trunk/libavutil/internal.h	Fri Jun 26 19:43:05 2009	(r19281)
+++ trunk/libavutil/internal.h	Sat Jun 27 10:34:04 2009	(r19282)
@@ -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

Modified: trunk/libavutil/mem.h
==============================================================================
--- trunk/libavutil/mem.h	Fri Jun 26 19:43:05 2009	(r19281)
+++ trunk/libavutil/mem.h	Sat Jun 27 10:34:04 2009	(r19282)
@@ -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)