Merge commit '042c25f54bd25b52d2936b822be026450971a82d' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 17:12:14 +0000 (19:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 17:13:07 +0000 (19:13 +0200)
commitacf7c5b8ee63d4a3614dd93aa7bcc23d582c3ccd
tree395c402e17a7b6c5117f4761822a1f31b96cf967
parenta5a2f8ac5ab4db6ab9931c65b9499ca165b51a6e
parent042c25f54bd25b52d2936b822be026450971a82d
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>