From a3a55b7848ed9eda1b1ef4577712d9df5efe6c4c Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Date: Sun, 28 Jun 2009 18:28:27 +0000
Subject: Icc does not support attribute flatten, do not try to use it.

Originally committed as revision 19286 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavutil/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libavutil/common.h')

diff --git a/libavutil/common.h b/libavutil/common.h
index 24e900551f..5f47572770 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -82,7 +82,7 @@
 #endif
 
 #ifndef av_flatten
-#if AV_GCC_VERSION_AT_LEAST(4,1)
+#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,1)
 #    define av_flatten __attribute__((flatten))
 #else
 #    define av_flatten
-- 
cgit v1.2.3