merge

[ffmpeg] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0ce8d8c1b2ad89e9f31e7843592ad8288ec6a4a9..d539b7b3f4739e0648b817764d2131cc7c3f1abb 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -97,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:
@@ -108,6 +108,7 @@ Codecs:
   8bps.c                                Roberto Togni
   aasc.c                                Kostya Shishkov
   ac3*                                  Justin Ruggles
+  apedec.c                              Kostya Shishkov
   asv*                                  Michael Niedermayer
   atrac3*                               Benjamin Larsson
   bmp.c                                 Mans Rullgard
@@ -117,7 +118,7 @@ Codecs:
   cook.c, cookdata.h                    Benjamin Larsson
   cscd.c                                Reimar Doeffinger
   dca.c                                 Kostya Shishkov
-  dnxhddec.c                            Baptiste Coudurier
+  dnxhd*                                Baptiste Coudurier
   dpcm.c                                Mike Melanson
   dxa.c                                 Kostya Shishkov
   dv.c                                  Roman Shaposhnik
@@ -138,8 +139,9 @@ Codecs:
   interplayvideo.c                      Mike Melanson
   jpeg_ls.c                             Kostya Shishkov
   kmvc.c                                Kostya Shishkov
-  lcl.c                                 Roberto Togni
+  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
@@ -151,7 +153,6 @@ 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
@@ -179,6 +180,7 @@ Codecs:
   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
@@ -186,7 +188,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
@@ -207,6 +208,7 @@ Muxers/Demuxers:
   4xm.c                                 Mike Melanson
   adtsenc.c                             Mans Rullgard
   aiff.c                                Baptiste Coudurier
+  ape.c                                 Kostya Shishkov
   avi*                                  Michael Niedermayer
   crc.c                                 Michael Niedermayer
   daud.c                                Reimar Doeffinger
@@ -222,6 +224,7 @@ Muxers/Demuxers:
   img2.c                                Michael Niedermayer
   libnut.c                              Oded Shimon
   matroska.c                            Aurelien Jacobs
+  matroskaenc.c                         David Conrad
   mov.c                                 Michael Niedermayer, Baptiste Coudurier
   movenc.c                              Michael Niedermayer, Baptiste Coudurier
   mpc.c                                 Kostya Shishkov
@@ -237,6 +240,9 @@ Muxers/Demuxers:
   psxstr.c                              Mike Melanson
   raw.c                                 Michael Niedermayer
   rm.c                                  Roberto Togni
+  rtp*.c (Muxer only)                   Luca Abeni
+  rtsp.c                                Luca Barbato
+  sdp.c                                 Luca Abeni
   segafilm.c                            Mike Melanson
   swf.c                                 Baptiste Coudurier
   txd.c                                 Ivo van Poorten
@@ -254,8 +260,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
+Windows MinGW                           Alex Beregszaszi, Ramiro Polla
+Windows Cygwin                          Victor Paesa
 ADI/Blackfin DSP                        Marc Hoffman