Merge commit '570d4b21863b6254d6bbca9c528bede471bb4478'

[ffmpeg] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index dc8f83b0604466961418bf0bc4ffd6c8b378f590..f06c23f92f7f07bf5c83f6757fae912df3ea5bcc 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -54,7 +54,8 @@ release management                      Michael Niedermayer
 Communication
 =============
 
-website                                 Robert Swain, Lou Logan
+website                                 Robert Swain
+Trac bug tracker                        Alexander Strasser, Michael Niedermayer, Carl Eugen Hoyos, Lou Logan
 mailinglists                            Michael Niedermayer, Baptiste Coudurier, Lou Logan
 Google+                                 Paul B Mahol, Michael Niedermayer, Alexander Strasser
 Twitter                                 Lou Logan
@@ -340,6 +341,7 @@ Filters:
   af_ladspa.c                           Paul B Mahol
   af_pan.c                              Nicolas George
   avf_avectorscope.c                    Paul B Mahol
+  avf_showcqt.c                         Muhammad Faiz
   vf_blend.c                            Paul B Mahol
   vf_colorbalance.c                     Paul B Mahol
   vf_dejudder.c                         Nicholas Robbins
@@ -417,6 +419,7 @@ Muxers/Demuxers:
   matroska.c                            Aurelien Jacobs
   matroskadec.c                         Aurelien Jacobs
   matroskaenc.c                         David Conrad
+  matroska subtitles (matroskaenc.c)    John Peebles
   metadata*                             Aurelien Jacobs
   mgsts.c                               Paul B Mahol
   microdvd*                             Aurelien Jacobs