Merge commit '44690dfa683f620c77e9f0e8e9bc5682608636b1'

[ffmpeg] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 53ef452d9a3ed2445261ca442b279e930e2806c0..597dc95e21775933741f4d09828058fd76caf9c3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -44,15 +44,22 @@ Miscellaneous Areas
 ===================
 
 documentation                           Mike Melanson
-website                                 Robert Swain, Lou Logan
 build system (configure,Makefiles)      Diego Biurrun, Mans Rullgard
 project server                          Árpád Gereöffy, Michael Niedermayer, Reimar Döffinger, Alexander Strasser
-mailinglists                            Michael Niedermayer, Baptiste Coudurier, Lou Logan
 presets                                 Robert Swain
 metadata subsystem                      Aurelien Jacobs
 release management                      Michael Niedermayer
 
 
+Communication
+=============
+
+website                                 Robert Swain, Lou Logan
+mailinglists                            Michael Niedermayer, Baptiste Coudurier, Lou Logan
+Google+                                 Paul B Mahol, Michael Niedermayer, Alexander Strasser
+Twitter                                 Lou Logan
+
+
 libavutil
 =========
 
@@ -290,6 +297,7 @@ libavdevice
   dshow.c                               Roger Pack
   iec61883.c                            Georg Lippitsch
   libdc1394.c                           Roman Shaposhnik
+  pulse_audio_enc.c                     Lukasz Marek
   v4l2.c                                Luca Abeni
   vfwcap.c                              Ramiro Polla