Merge commit '5858a67f135a7395c548482c73cf3d39bcdd3022'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Nov 2013 11:37:54 +0000 (12:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Nov 2013 11:38:13 +0000 (12:38 +0100)
* commit '5858a67f135a7395c548482c73cf3d39bcdd3022':
  attributes: disable flatten on llvm/clang

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/attributes.h

Simple merge