Commit 08e7644b authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '5858a67f'

* commit '5858a67f':
  attributes: disable flatten on llvm/clang
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 7edc9240 5858a67f
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
# define av_cold # define av_cold
#endif #endif
#if AV_GCC_VERSION_AT_LEAST(4,1) #if AV_GCC_VERSION_AT_LEAST(4,1) && !defined(__llvm__)
# define av_flatten __attribute__((flatten)) # define av_flatten __attribute__((flatten))
#else #else
# define av_flatten # define av_flatten
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment