Merge commit '5ec6d152e26c570c0a16ec72c1f354db95708179'

[ffmpeg] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 13e240ade1963e4d64781b737c8e75d3bc231ed3..d06030bb2bdab78d52d1c746a439b7a08a14e0f5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -55,6 +55,7 @@ Communication
 =============
 
 website                                 Robert Swain
+fate.ffmpeg.org                         Timothy Gu
 Trac bug tracker                        Alexander Strasser, Michael Niedermayer, Carl Eugen Hoyos, Lou Logan
 mailing lists                           Michael Niedermayer, Baptiste Coudurier, Lou Logan
 Google+                                 Paul B Mahol, Michael Niedermayer, Alexander Strasser
@@ -179,7 +180,7 @@ Codecs:
   h261*                                 Michael Niedermayer
   h263*                                 Michael Niedermayer
   h264*                                 Loren Merritt, Michael Niedermayer
-  huffyuv.c                             Michael Niedermayer
+  huffyuv*                              Michael Niedermayer, Christophe Gisquet
   idcinvideo.c                          Mike Melanson
   imc*                                  Benjamin Larsson
   indeo2*                               Kostya Shishkov
@@ -239,7 +240,7 @@ Codecs:
   rtjpeg.c, rtjpeg.h                    Reimar Doeffinger
   rv10.c                                Michael Niedermayer
   rv3*                                  Kostya Shishkov
-  rv4*                                  Kostya Shishkov
+  rv4*                                  Kostya Shishkov, Christophe Gisquet
   s3tc*                                 Ivo van Poorten
   smacker.c                             Kostya Shishkov
   smc.c                                 Mike Melanson
@@ -263,7 +264,7 @@ Codecs:
   v410*.c                               Derek Buitenhuis
   vb.c                                  Kostya Shishkov
   vble.c                                Derek Buitenhuis
-  vc1*                                  Kostya Shishkov
+  vc1*                                  Kostya Shishkov, Christophe Gisquet
   vcr1.c                                Michael Niedermayer
   vda_h264_dec.c                        Xidorn Quan
   vima.c                                Paul B Mahol
@@ -349,6 +350,7 @@ Filters:
   vf_drawbox.c/drawgrid                 Andrey Utkin
   vf_extractplanes.c                    Paul B Mahol
   vf_histogram.c                        Paul B Mahol
+  vf_hqx.c                              Clément Bœsch
   vf_il.c                               Paul B Mahol
   vf_mergeplanes.c                      Paul B Mahol
   vf_psnr.c                             Paul B Mahol
@@ -564,5 +566,7 @@ Robert Swain                  EE7A 56EA 4A81 A7B5 2001 A521 67FA 362D A2FC 3E71
 Sascha Sommer                 38A0 F88B 868E 9D3A 97D4 D6A0 E823 706F 1E07 0D3C
 Stefano Sabatini              0D0B AD6B 5330 BBAD D3D6 6A0C 719C 2839 FC43 2D5F
 Stephan Hilb                  4F38 0B3A 5F39 B99B F505 E562 8D5C 5554 4E17 8863
+Tiancheng "Timothy" Gu        9456 AFC0 814A 8139 E994 8351 7FE6 B095 B582 B0D4
+Tim Nicholson                 38CF DB09 3ED0 F607 8B67 6CED 0C0B FC44 8B0B FC83
 Tomas Härdin                  A79D 4E3D F38F 763F 91F5 8B33 A01E 8AE0 41BB 2551
 Wei Gao                       4269 7741 857A 0E60 9EC5 08D2 4744 4EFA 62C1 87B9