[FFmpeg-cvslog] Merge commit '7a76c6c4df31d1ff65464ccf3171acd57ef004eb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 11 20:38:08 2015 +0100| [2ba0ef4b15ccfeb1b7dcdca7dcbcc0a3f77f18b8] | committer: Michael Niedermayer

Merge commit '7a76c6c4df31d1ff65464ccf3171acd57ef004eb'

* commit '7a76c6c4df31d1ff65464ccf3171acd57ef004eb':
  configure: Enable colored output for gcc 4.9+

Conflicts:
	configure

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

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