[FFmpeg-cvslog] Merge commit 'fc3c1156e361202ab97ad63ffb4dacc416906d33' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  9 00:16:15 2015 +0100| [61b5dee49e74c400647951d1b0c26bb88116efb5] | committer: Michael Niedermayer

Merge commit 'fc3c1156e361202ab97ad63ffb4dacc416906d33' into release/2.4

* commit 'fc3c1156e361202ab97ad63ffb4dacc416906d33':
  doc: Update changelog for v11.3

Conflicts:
	Changelog

Not merged, the changelog is not correct for FFmpeg

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

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