diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-03 12:37:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-03 12:38:13 +0100 |
| commit | 08e7644b685398e34a8577dd8d1c6f5d036dee79 (patch) | |
| tree | 72a7d02956f7e4f01f1b37e1c78d11cc264eef77 | |
| parent | 7edc9240a8f424fdcb30efeed127ffca8145774a (diff) | |
| parent | 5858a67f135a7395c548482c73cf3d39bcdd3022 (diff) | |
| download | ffmpeg-08e7644b685398e34a8577dd8d1c6f5d036dee79.tar.gz | |
Merge commit '5858a67f135a7395c548482c73cf3d39bcdd3022'
* commit '5858a67f135a7395c548482c73cf3d39bcdd3022':
attributes: disable flatten on llvm/clang
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/attributes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/attributes.h b/libavutil/attributes.h index 8c0e5b2979..7d3f4a91cf 100644 --- 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 |