Merge remote-tracking branch 'qatar/master'

[ffmpeg] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6f371c0b719c9f1158f02b7ed3ddeee151823998..e5ba8d2fac8297f84f91ca04f617efab4adc6f15 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -125,6 +125,7 @@ Codecs:
   cinepak.c                             Roberto Togni
   cljr                                  Alex Beregszaszi
   cook.c, cookdata.h                    Benjamin Larsson
+  crystalhd.c                           Philip Langdale
   cscd.c                                Reimar Doeffinger
   dca.c                                 Kostya Shishkov, Benjamin Larsson
   dnxhd*                                Baptiste Coudurier
@@ -198,7 +199,7 @@ Codecs:
   smc.c                                 Mike Melanson
   snow.c                                Michael Niedermayer, Loren Merritt
   sonic.c                               Alex Beregszaszi
-  srtdec.c                              Aurelien Jacobs
+  srt*                                  Aurelien Jacobs
   sunrast.c                             Ivo van Poorten
   svq3.c                                Michael Niedermayer
   targa.c                               Kostya Shishkov
@@ -293,6 +294,7 @@ Muxers/Demuxers:
   matroskadec.c                         Aurelien Jacobs
   matroskaenc.c                         David Conrad
   metadata*                             Aurelien Jacobs
+  microdvd*                             Aurelien Jacobs
   mm.c                                  Peter Ross
   mov.c                                 Michael Niedermayer, Baptiste Coudurier
   movenc.c                              Michael Niedermayer, Baptiste Coudurier
@@ -360,6 +362,16 @@ Sparc                                   Roman Shaposhnik
 x86                                     Michael Niedermayer
 
 
+Releases
+========
+
+0.5                                     *Deprecated/Unmaintained*
+0.6                                     Stefano Sabatini
+0.7                                     Michael Niedermayer
+0.8                                     Michael Niedermayer
+
+
+
 GnuPG Fingerprints of maintainers and others who have svn write access
 ======================================================================