summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-01 03:34:59 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-01 03:34:59 +0100
commite4a6310cce5c1663f68253c50f364fc0c055f05a (patch)
tree75416c742bb58007f5a629a64688fea14b981ce2
parent0a8c90202bb906747168a698b6837496f82c717c (diff)
update for 2.2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--Changelog3
-rw-r--r--MAINTAINERS1
-rw-r--r--doc/RELEASE_NOTES2
3 files changed, 5 insertions, 1 deletions
diff --git a/Changelog b/Changelog
index 2785b3a6f4..bed77a80b8 100644
--- a/Changelog
+++ b/Changelog
@@ -3,6 +3,9 @@ releases are sorted from youngest to oldest.
version <next>
+
+version 2.2:
+
- HNM version 4 demuxer and video decoder
- Live HDS muxer
- setsar/setdar filters now support variables in ratio expressions
diff --git a/MAINTAINERS b/MAINTAINERS
index 1a6968cafc..6a61ebae97 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -511,6 +511,7 @@ x86 Michael Niedermayer
Releases
========
+2.2 Michael Niedermayer
2.1 Michael Niedermayer
1.2 Michael Niedermayer
diff --git a/doc/RELEASE_NOTES b/doc/RELEASE_NOTES
index fae3a2bf3f..b3338b9fee 100644
--- a/doc/RELEASE_NOTES
+++ b/doc/RELEASE_NOTES
@@ -1,7 +1,7 @@
Release Notes
=============
-* 2.1 "Fourier" October, 2013
+* 2.2 "Muybridge" March, 2014
General notes