Merge commit '5858a67f135a7395c548482c73cf3d39bcdd3022'

* commit '5858a67f135a7395c548482c73cf3d39bcdd3022': attributes: disable flatten on llvm/clang Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 08e7644b68
parent 7edc9240a8 5858a67f13
commit 08e7644b68
1 changed files with 1 additions and 1 deletions
--- 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