[FFmpeg-cvslog] Merge commit '2d589273dd36c5eb271a035ea0e669b64dae257f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 16 11:57:58 2014 +0200| [5ddfac81c4a9420c4972aea5f36f0400fcb67044] | committer: Michael Niedermayer

Merge commit '2d589273dd36c5eb271a035ea0e669b64dae257f'

* commit '2d589273dd36c5eb271a035ea0e669b64dae257f':
  configure: Split adding of CFLAGS and CPPFLAGS for hardened toolchain

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

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