Merge commit 'cbe28bc069dde1d53d937ee10700bb123279c7c8'

[ffmpeg] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6a92b5190df521a6ccc6746979f55488efcf90e8..e5839261af71433c33df73ab91914e9cd1289476 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -29,9 +29,6 @@ ffplay:
 ffprobe:
   ffprobe.c                             Stefano Sabatini
 
-ffserver:
-  ffserver.c                            Reynaldo H. Verdejo Pinochet
-
 Commandline utility code:
   cmdutils.c, cmdutils.h                Michael Niedermayer