Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

[ffmpeg] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9441bd02b3cd9d446870cec658573cacc5958774..aa1b5ed6f022af5d7528498cba4efd11098bfa46 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4,7 +4,7 @@ FFmpeg maintainers
 Below is a list of the people maintaining different parts of the
 FFmpeg code.
 
-Please try to keep entries where you are the maintainer upto date!
+Please try to keep entries where you are the maintainer up to date!
 
 Names in () mean that the maintainer currently has no time to maintain the code.
 A CC after the name means that the maintainer prefers to be CC-ed on patches
@@ -159,6 +159,7 @@ Codecs:
   indeo5*                               Kostya Shishkov
   interplayvideo.c                      Mike Melanson
   ivi*                                  Kostya Shishkov
+  jacosub*                              Clément Bœsch
   jpeg_ls.c                             Kostya Shishkov
   jvdec.c                               Peter Ross
   kmvc.c                                Kostya Shishkov
@@ -244,6 +245,7 @@ Codecs:
   xan.c                                 Mike Melanson
   xl.c                                  Kostya Shishkov
   xvmc.c                                Ivan Kalvachev
+  zerocodec.c                           Derek Buitenhuis
   zmbv*                                 Kostya Shishkov
 
 Hardware acceleration:
@@ -314,6 +316,7 @@ Muxers/Demuxers:
   ipmovie.c                             Mike Melanson
   img2.c                                Michael Niedermayer
   iss.c                                 Stefan Gehrer
+  jacosub*                              Clément Bœsch
   jvdec.c                               Peter Ross
   libmodplug.c                          Clément Bœsch
   libnut.c                              Oded Shimon
@@ -397,8 +400,8 @@ x86                                     Michael Niedermayer
 Releases
 ========
 
+0.11                                    Michael Niedermayer
 0.10                                    Michael Niedermayer
-0.9                                     Michael Niedermayer