Merge commit '40dd29653ab85812d21fa64e9a665ceb316701ad' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:57:48 +0000 (22:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:57:48 +0000 (22:57 +0200)
* commit '40dd29653ab85812d21fa64e9a665ceb316701ad':
  Prepare for 10.2 Release
  Update Changelog for v10.2

Conflicts:
Changelog
RELEASE

Not merged as these dont align with our releases

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

index ef8696f..85a971a 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -2,7 +2,6 @@ Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
 version 2.2:
-
 - HNM version 4 demuxer and video decoder
 - Live HDS muxer
 - setsar/setdar filters now support variables in ratio expressions