Merge commit '4bb1070c154e49d35805fbcdac9c9e92f702ef96'

[ffmpeg] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index fd9507cb49c42795835bb914e8ab7797c5af4339..373574278be87141feef788430e8e0f8246c5177 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -185,6 +185,7 @@ Codecs:
   h261*                                 Michael Niedermayer
   h263*                                 Michael Niedermayer
   h264*                                 Loren Merritt, Michael Niedermayer
+  hap*                                  Tom Butterworth
   huffyuv*                              Michael Niedermayer, Christophe Gisquet
   idcinvideo.c                          Mike Melanson
   imc*                                  Benjamin Larsson
@@ -346,7 +347,6 @@ Filters:
   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_chorus.c                           Paul B Mahol
@@ -589,6 +589,7 @@ Clément Bœsch                 52D0 3A82 D445 F194 DB8B 2B16 87EE 2CB8 F4B8 FCF
 Daniel Verkamp                78A6 07ED 782C 653E C628 B8B9 F0EB 8DD8 2F0E 21C7
 Diego Biurrun                 8227 1E31 B6D9 4994 7427 E220 9CAE D6CC 4757 FCC5
 FFmpeg release signing key    FCF9 86EA 15E6 E293 A564 4F10 B432 2F04 D676 58D8
+Ganesh Ajjanagadde            C96A 848E 97C3 CEA2 AB72 5CE4 45F9 6A2D 3C36 FB1B
 Gwenole Beauchesne            2E63 B3A6 3E44 37E2 017D 2704 53C7 6266 B153 99C4
 Jaikrishnan Menon             61A1 F09F 01C9 2D45 78E1 C862 25DC 8831 AF70 D368
 Jean Delvare                  7CA6 9F44 60F1 BDC4 1FD2 C858 A552 6B9B B3CD 4E6A