summaryrefslogtreecommitdiff
path: root/libavutil/mem.h
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2010-11-10 12:45:41 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2010-11-10 12:45:41 +0000
commit086e997e34d05b27804a8521791399ecccd76011 (patch)
tree6df5cf6d9d2a2d9e35093efb7e1a85e00f5716ba /libavutil/mem.h
parent8079d2ec088ceed7773c004953f9870262358bed (diff)
Intel C compiler 12.0 does not suport these attributes: may_alias, force_align_arg_pointer and alloc_size.
Originally committed as revision 25716 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/mem.h')
-rw-r--r--libavutil/mem.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/mem.h b/libavutil/mem.h
index c5ec2ab3c3..1ec8eb8601 100644
--- 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)