[FFmpeg-cvslog] update for 2.2

Michael Niedermayer git at videolan.org
Sat Mar 1 03:40:13 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  1 03:34:59 2014 +0100| [e4a6310cce5c1663f68253c50f364fc0c055f05a] | committer: Michael Niedermayer

update for 2.2

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4a6310cce5c1663f68253c50f364fc0c055f05a
---

 Changelog         |    3 +++
 MAINTAINERS       |    1 +
 doc/RELEASE_NOTES |    2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index 2785b3a..bed77a8 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 1a6968c..6a61eba 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 fae3a2b..b3338b9 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



More information about the ffmpeg-cvslog mailing list