Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99'

[ffmpeg] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8b654f4130e2466008e8012fb46a586732e8bfc7..8b24771edc63e242dcac4bf0fac011dc3bf0d9af 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -58,6 +58,7 @@ website                                 Robert Swain, Lou Logan
 mailinglists                            Michael Niedermayer, Baptiste Coudurier, Lou Logan
 Google+                                 Paul B Mahol, Michael Niedermayer, Alexander Strasser
 Twitter                                 Lou Logan
+Launchpad                               Timothy Gu
 
 
 libavutil
@@ -198,6 +199,7 @@ Codecs:
   libvorbis.c                           David Conrad
   libx264.c                             Mans Rullgard, Jason Garrett-Glaser
   libxavs.c                             Stefan Gehrer
+  libzvbi-teletextdec.c                 Marton Balint
   loco.c                                Kostya Shishkov
   lzo.h, lzo.c                          Reimar Doeffinger
   mdec.c                                Michael Niedermayer
@@ -312,14 +314,33 @@ Generic parts:
   graphdump.c                           Nicolas George
 
 Filters:
+  af_adelay.c                           Paul B Mahol
+  af_aecho.c                            Paul B Mahol
+  af_afade.c                            Paul B Mahol
   af_amerge.c                           Nicolas George
+  af_aphaser.c                          Paul B Mahol
   af_aresample.c                        Michael Niedermayer
+  af_astats.c                           Paul B Mahol
   af_astreamsync.c                      Nicolas George
   af_atempo.c                           Pavel Koshevoy
+  af_biquads.c                          Paul B Mahol
+  af_compand.c                          Paul B Mahol
+  af_ladspa.c                           Paul B Mahol
   af_pan.c                              Nicolas George
+  avf_avectorscope.c                    Paul B Mahol
+  vf_blend.c                            Paul B Mahol
+  vf_colorbalance.c                     Paul B Mahol
   vf_delogo.c                           Jean Delvare (CC <khali@linux-fr.org>)
   vf_drawbox.c/drawgrid                 Andrey Utkin
+  vf_extractplanes.c                    Paul B Mahol
+  vf_histogram.c                        Paul B Mahol
+  vf_il.c                               Paul B Mahol
+  vf_mergeplanes.c                      Paul B Mahol
+  vf_psnr.c                             Paul B Mahol
   vf_scale.c                            Michael Niedermayer
+  vf_separatefields.c                   Paul B Mahol
+  vf_stereo3d.c                         Paul B Mahol
+  vf_telecine.c                         Paul B Mahol
   vf_yadif.c                            Michael Niedermayer
 
 Sources:
@@ -481,8 +502,8 @@ x86                                     Michael Niedermayer
 Releases
 ========
 
+2.1                                     Michael Niedermayer
 2.0                                     Michael Niedermayer
-1.2                                     Michael Niedermayer
 
 If you want to maintain an older release, please contact us