[FFmpeg-cvslog] Merge commit '798b3ed3fbc31672e6400e18db37deef03fff44f' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 10 14:13:56 2015 +0100| [9e835572f80b6ab82a07206ac302637039e671da] | committer: Michael Niedermayer

Merge commit '798b3ed3fbc31672e6400e18db37deef03fff44f' into release/1.1

* commit '798b3ed3fbc31672e6400e18db37deef03fff44f':
  doc: More changelog updates for v9.18

Conflicts:
	Changelog

not merged

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

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