[FFmpeg-cvslog] Merge commit '042c25f54bd25b52d2936b822be026450971a82d' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 12 19:12:14 2014 +0200| [acf7c5b8ee63d4a3614dd93aa7bcc23d582c3ccd] | committer: Michael Niedermayer

Merge commit '042c25f54bd25b52d2936b822be026450971a82d' into release/0.10

* commit '042c25f54bd25b52d2936b822be026450971a82d':
  Update Changelog for v0.8.14

Conflicts:
	Changelog

Not merged as the Changelog isnt correct for FFmpeg

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

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