diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-06-28 18:28:27 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-06-28 18:28:27 +0000 |
| commit | a3a55b7848ed9eda1b1ef4577712d9df5efe6c4c (patch) | |
| tree | 46a01cfd061c6270808d7e87346621ca3c798227 /libavutil/common.h | |
| parent | 39a4f14643804bd11debad73ca45ed0d4cbf011d (diff) | |
Icc does not support attribute flatten, do not try to use it.
Originally committed as revision 19286 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/common.h')
| -rw-r--r-- | libavutil/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |