Merge commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce'

[ffmpeg] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index cc4c23df6f75ad0b09b7c4f2b0db29c3fefc9fba..b61856243cc10dc038cf886d6a6b88edad95310d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -39,7 +39,7 @@ QuickTime faststart:
 Miscellaneous Areas
 ===================
 
-documentation                           Stefano Sabatini, Mike Melanson, Timothy Gu, Lou Logan
+documentation                           Stefano Sabatini, Mike Melanson, Timothy Gu, Lou Logan, Gyan Doshi
 project server                          Árpád Gereöffy, Michael Niedermayer, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov
 presets                                 Robert Swain
 metadata subsystem                      Aurelien Jacobs
@@ -268,7 +268,7 @@ Hardware acceleration:
   crystalhd.c                           Philip Langdale
   dxva2*                                Hendrik Leppkes, Laurent Aimar, Steve Lhomme
   d3d11va*                              Steve Lhomme
-  mediacodec*                           Matthieu Bouron
+  mediacodec*                           Matthieu Bouron, Aman Gupta
   vaapi*                                Gwenole Beauchesne
   vaapi_encode*                         Mark Thompson
   vdpau*                                Philip Langdale, Carl Eugen Hoyos
@@ -552,6 +552,7 @@ Ivan Uskov
 James Darnley
 Jan Ekström
 Joakim Plate
+Jun Zhao
 Kieran Kunhya
 Kirill Gavrilov
 Martin Storsjö