aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/internal.h
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2008-12-21 22:51:33 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2008-12-21 22:51:33 +0000
commitaf4c0bcb6ed6f3d679dddfe9c4fd4f73f84fcabc (patch)
tree8beda6b11d9eaebe1e7dd35fa3583d7ab9ac8045 /libavutil/internal.h
parent1af34f094e2e28c26effbf42adf9479a8b759069 (diff)
downloadffmpeg-af4c0bcb6ed6f3d679dddfe9c4fd4f73f84fcabc.tar.gz
Silence the following icc warnings:
warning #1292: attribute "force_align_arg_pointer" ignored warning #1292: attribute "alloc_size" ignored warning #1292: attribute "cold" ignored Originally committed as revision 16258 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/internal.h')
-rw-r--r--libavutil/internal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 9d029dd97a..251cc33b00 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -36,7 +36,7 @@
#include "common.h"
#ifndef attribute_align_arg
-#if AV_GCC_VERSION_AT_LEAST(4,2)
+#if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,2)
# define attribute_align_arg __attribute__((force_align_arg_pointer))
#else
# define attribute_align_arg