Merge remote-tracking branch 'qatar/master'
[ffmpeg.git] / MAINTAINERS
index 8d71dca..f265907 100644 (file)
@@ -132,6 +132,7 @@ Codecs:
   celp_filters.*                        Vitor Sessak
   cinepak.c                             Roberto Togni
   cljr                                  Alex Beregszaszi
+  cllc.c                                Derek Buitenhuis
   cook.c, cookdata.h                    Benjamin Larsson
   crystalhd.c                           Philip Langdale
   cscd.c                                Reimar Doeffinger
@@ -263,6 +264,7 @@ libavdevice
     libavdevice/avdevice.h
 
 
+  iec61883.c                            Georg Lippitsch
   libdc1394.c                           Roman Shaposhnik
   v4l2.c                                Luca Abeni
   vfwcap.c                              Ramiro Polla
@@ -271,15 +273,18 @@ libavdevice
 libavfilter
 ===========
 
-Video filters:
+Generic parts:
   graphdump.c                           Nicolas George
+
+Filters:
   af_amerge.c                           Nicolas George
   af_astreamsync.c                      Nicolas George
   af_atempo.c                           Pavel Koshevoy
   af_pan.c                              Nicolas George
-  vsrc_mandelbrot.c                     Michael Niedermayer
   vf_yadif.c                            Michael Niedermayer
 
+Sources:
+  vsrc_mandelbrot.c                     Michael Niedermayer
 
 libavformat
 ===========