[FFmpeg-cvslog] Merge commit '4d25c2bc76f0a708c2ba470b6bfeb547efe37115'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 16 22:24:16 2014 +0200| [627d3b8b730dfa1c1adc21dd36f730dde37de46d] | committer: Michael Niedermayer

Merge commit '4d25c2bc76f0a708c2ba470b6bfeb547efe37115'

* commit '4d25c2bc76f0a708c2ba470b6bfeb547efe37115':
  build: Support building using clang-usan and disable-optimization

Change not merged, as it has been fixed differently and this change
would prevent disabling optimizations with ubsan

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

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