Merge commit '60ccc1a748bf3d26201411479146d0798e1ecff9' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 11:40:20 +0000 (12:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 11:40:20 +0000 (12:40 +0100)
commit309609ce4d75a7ff10c8c8a7b710f2bbb3eb99b3
treef3d730fa6df134b69c94058c80b91824ac8790f8
parent6607057d0e037f9bc87136210bcc681313738e57
parent60ccc1a748bf3d26201411479146d0798e1ecff9
Merge commit '60ccc1a748bf3d26201411479146d0798e1ecff9' into release/2.4

* commit '60ccc1a748bf3d26201411479146d0798e1ecff9':
  Update changelog for v11.1

Conflicts:
Changelog

Not merged, the changelog does not match FFmpeg

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