[FFmpeg-cvslog] r25716 - in trunk/libavutil: attributes.h internal.h mem.h

[cehoyos]

Author: cehoyos
Date: Wed Nov 10 13:45:41 2010
New Revision: 25716

Log:
Intel C compiler 12.0 does not suport these attributes: may_alias, force_align_arg_pointer and alloc_size.

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

Modified: trunk/libavutil/attributes.h
==============================================================================
--- trunk/libavutil/attributes.h	Wed Nov 10 01:04:12 2010	(r25715)
+++ trunk/libavutil/attributes.h	Wed Nov 10 13:45:41 2010	(r25716)
@@ -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

Modified: trunk/libavutil/internal.h
==============================================================================
--- trunk/libavutil/internal.h	Wed Nov 10 01:04:12 2010	(r25715)
+++ trunk/libavutil/internal.h	Wed Nov 10 13:45:41 2010	(r25716)
@@ -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

Modified: trunk/libavutil/mem.h
==============================================================================
--- trunk/libavutil/mem.h	Wed Nov 10 01:04:12 2010	(r25715)
+++ trunk/libavutil/mem.h	Wed Nov 10 13:45:41 2010	(r25716)
@@ -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)