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@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-12 19:12:14 +02:00
commit acf7c5b8ee

Diff Content Not Available