Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavutil / attributes.h

diff --git a/libavutil/attributes.h b/libavutil/attributes.h
index 8c0e5b2979d959edc6cff747f54b13faa591d5da..7d3f4a91cfd0d1af677e550be7fd09b434457675 100644 (file)
--- a/libavutil/attributes.h
+++ b/libavutil/attributes.h
@@ -76,7 +76,7 @@
 #    define av_cold
 #endif
 
-#if AV_GCC_VERSION_AT_LEAST(4,1)
+#if AV_GCC_VERSION_AT_LEAST(4,1) && !defined(__llvm__)
 #    define av_flatten __attribute__((flatten))
 #else
 #    define av_flatten