Merge commit '5f6f2412211609e46d3f3573f4ac4e136534f1d4' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 02:54:58 +0000 (03:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 02:54:58 +0000 (03:54 +0100)
commit2b95572b10ec8188f7e4061046a0c66a8ebd8e85
treee40c02b714170f59e239a55d1a2bae9fd10be070
parentf5dd1270d9dd65cac47aab6045d25e4607695f4c
parent5f6f2412211609e46d3f3573f4ac4e136534f1d4
Merge commit '5f6f2412211609e46d3f3573f4ac4e136534f1d4' into release/2.4

* commit '5f6f2412211609e46d3f3573f4ac4e136534f1d4':
  doc: Update the Changelog for release 11.2

Conflicts:
Changelog

No change as the changelog is not correct for FFmpeg

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