projects / platform / upstream / libav.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 39a4f14)
Icc does not support attribute flatten, do not try to use it.
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Sun, 28 Jun 2009 18:28:27 +0000 (18:28 +0000)
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Sun, 28 Jun 2009 18:28:27 +0000 (18:28 +0000)
Originally committed as revision 19286 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavutil/common.h patch | blob | history

diff --git a/libavutil/common.h b/libavutil/common.h
index 24e9005..5f47572 100644 (file)
--- 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
Domain: Multimedia / Media Content;