update for 2.2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
FFmpeg · Mar 1, 2014 · e4a6310 · e4a6310
1 parent 0a8c902
commit e4a6310
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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
@@ -1,7 +1,7 @@
 Release Notes
 =============
 
-* 2.1 "Fourier"  October, 2013
+* 2.2 "Muybridge"  March, 2014
 
 
 General notes