[FFmpeg-cvslog] Merge commit '5858a67f135a7395c548482c73cf3d39bcdd3022'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov  3 12:37:54 2013 +0100| [08e7644b685398e34a8577dd8d1c6f5d036dee79] | committer: Michael Niedermayer

Merge commit '5858a67f135a7395c548482c73cf3d39bcdd3022'

* commit '5858a67f135a7395c548482c73cf3d39bcdd3022':
  attributes: disable flatten on llvm/clang

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=08e7644b685398e34a8577dd8d1c6f5d036dee79
---