revert my accidental previous commit

[ffmpeg] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9dd13aec260e6a38b684362544fd605f48442609..e789d29b71b64164c4c78edd82e8517c34bcf1dd 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -31,7 +31,7 @@ ffplay:
   ffplay.c
 
 ffserver:
-  ffserver.c, ffserver.h
+  ffserver.c, ffserver.h                Alex Beregszaszi
 
 Commandline utility code:
   cmdutils.c, cmdutils.h
@@ -80,7 +80,7 @@ Generic Parts:
     eval.c                              Michael Niedermayer
   audio and video frame extraction:
     parser.c
-  bitsream reading:
+  bitstream reading:
     bitstream.c, bitstream.h            Michael Niedermayer
   CABAC:
     cabac.h, cabac.c                    Michael Niedermayer
@@ -88,6 +88,7 @@ Generic Parts:
     dsputils.c, dsputils.h              Michael Niedermayer
   entropy coding:
     rangecoder.c, rangecoder.h          Michael Niedermayer
+    lzw.*                               Michael Niedermayer
   floating point AAN DCT:
     faandct.c, faandct.h                Michael Niedermayer
   Golomb coding:
@@ -96,7 +97,7 @@ Generic Parts:
     motion*                             Michael Niedermayer
   rate control:
     ratecontrol.c
-    xvid_rc.c                           Michael Niedermayer
+    libxvid_rc.c                        Michael Niedermayer
   simple IDCT:
     simple_idct.c, simple_idct.h        Michael Niedermayer
   postprocessing:
@@ -106,14 +107,19 @@ Codecs:
   4xm.c                                 Michael Niedermayer
   8bps.c                                Roberto Togni
   aasc.c                                Kostya Shishkov
+  ac3*                                  Justin Ruggles
   asv*                                  Michael Niedermayer
+  atrac3*                               Benjamin Larsson
   bmp.c                                 Mans Rullgard
   cavs*                                 Stefan Gehrer
   cinepak.c                             Roberto Togni
   cljr                                  Alex Beregszaszi
   cook.c, cookdata.h                    Benjamin Larsson
   cscd.c                                Reimar Doeffinger
+  dca.c                                 Kostya Shishkov
+  dnxhddec.c                            Baptiste Coudurier
   dpcm.c                                Mike Melanson
+  dxa.c                                 Kostya Shishkov
   dv.c                                  Roman Shaposhnik
   ffv1.c                                Michael Niedermayer
   flac.c                                Alex Beregszaszi
@@ -134,6 +140,7 @@ Codecs:
   kmvc.c                                Kostya Shishkov
   lcl.c                                 Roberto Togni
   libgsm.c                              Michel Bardiaux
+  libx264.c                             Mans Rullgard
   loco.c                                Kostya Shishkov
   lzo.h, lzo.c                          Reimar Doeffinger
   mdec.c                                Michael Niedermayer
@@ -145,7 +152,7 @@ Codecs:
   msrle.c                               Mike Melanson
   msvideo1.c                            Mike Melanson
   nuv.c                                 Reimar Doeffinger
-  oggtheora.c                           Mans Rullgard
+  ptx.c                                 Ivo van Poorten
   qdm2.c, qdm2data.h                    Roberto Togni
   qdrw.c                                Kostya Shishkov
   qpeg.c                                Kostya Shishkov
@@ -155,6 +162,7 @@ Codecs:
   rpza.c                                Roberto Togni
   rtjpeg.c, rtjpeg.h                    Reimar Doeffinger
   rv10.c                                Michael Niedermayer
+  s3tc*                                 Ivo van Poorten
   smc.c                                 Mike Melanson
   snow.c                                Michael Niedermayer, Loren Merritt
   sonic.c                               Alex Beregszaszi
@@ -165,11 +173,13 @@ Codecs:
   truemotion2*                          Kostya Shishkov
   truespeech.c                          Kostya Shishkov
   tscc.c                                Kostya Shishkov
+  txd.c                                 Ivo van Poorten
   ulti*                                 Kostya Shishkov
   vc1*                                  Kostya Shishkov
   vcr1.c                                Michael Niedermayer
   vmnc.c                                Kostya Shishkov
   vorbis_enc.c                          Oded Shimon
+  vorbis_dec.c                          Denes Balatoni
   vp3*                                  Mike Melanson
   vp5                                   Aurelien Jacobs
   vp6                                   Aurelien Jacobs
@@ -177,7 +187,6 @@ Codecs:
   wavpack.c                             Kostya Shishkov
   wmv2.c                                Michael Niedermayer
   wnv1.c                                Kostya Shishkov
-  x264.c                                Mans Rullgard
   xan.c                                 Mike Melanson
   xl.c                                  Kostya Shishkov
   xvmcvideo.c                           Ivan Kalvachev
@@ -202,6 +211,7 @@ Muxers/Demuxers:
   crc.c                                 Michael Niedermayer
   daud.c                                Reimar Doeffinger
   dc1394.c, dv.c                        Roman Shaposhnik
+  dxa.c                                 Kostya Shishkov
   flic.c                                Mike Melanson
   flvdec.c, flvenc.c                    Michael Niedermayer
   gxf.c                                 Reimar Doeffinger
@@ -210,15 +220,16 @@ Muxers/Demuxers:
   idroq.c                               Mike Melanson
   ipmovie.c                             Mike Melanson
   img2.c                                Michael Niedermayer
+  libnut.c                              Oded Shimon
   matroska.c                            Aurelien Jacobs
-  mov.c                                 Francois Revol, Michael Niedermayer
+  mov.c                                 Michael Niedermayer, Baptiste Coudurier
   movenc.c                              Michael Niedermayer, Baptiste Coudurier
   mpc.c                                 Kostya Shishkov
   mpegts*                               Mans Rullgard
   mtv.c                                 Reynaldo H. Verdejo Pinochet
   mxf.c                                 Baptiste Coudurier
   nsvdec.c                              Francois Revol
-  nut.c                                 Alex Beregszaszi
+  nut.c                                 Michael Niedermayer
   nuv.c                                 Reimar Doeffinger
   ogg2.c, ogg2.h                        Mans Rullgard
   oggparsevorbis.c                      Mans Rullgard
@@ -226,8 +237,10 @@ Muxers/Demuxers:
   psxstr.c                              Mike Melanson
   raw.c                                 Michael Niedermayer
   rm.c                                  Roberto Togni
+  rtsp.c                                Luca Barbato
   segafilm.c                            Mike Melanson
   swf.c                                 Baptiste Coudurier
+  txd.c                                 Ivo van Poorten
   v4l2.c                                Luca Abeni
   voc.c                                 Aurelien Jacobs
   wav.c                                 Michael Niedermayer
@@ -242,6 +255,9 @@ Operating systems / CPU architectures
 Alpha                                   Mans Rullgard, Falk Hueffner
 BeOS                                    Francois Revol
 i386                                    Michael Niedermayer
-Mac OS X / PowerPC                      Romain Dolbeau
+Mac OS X / PowerPC                      Romain Dolbeau, Guillaume Poirier
 Amiga / PowerPC                         Colin Ward
 Linux / PowerPC                         Luca Barbato
+Windows MinGW                           Alex Beregszaszi, Ramiro Polla
+Windows Cygwin                          Victor Paesa
+ADI/Blackfin DSP                        Marc Hoffman