doc/examples/muxing: Exchange tmp_frame and frame

[ffmpeg] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d06030bb2bdab78d52d1c746a439b7a08a14e0f5..392d509d58a0841a542363558afaf05170fa206c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -54,7 +54,7 @@ release management                      Michael Niedermayer
 Communication
 =============
 
 Communication
 =============
 

-website                                 Robert Swain
+website                                 Deby Barbara Lepage

 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
 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


@@ -132,6 +132,7 @@ Generic Parts:
     tableprint.c, tableprint.h          Reimar Doeffinger
   fixed point FFT:
     fft*                                Zeljko Lukac
     tableprint.c, tableprint.h          Reimar Doeffinger
   fixed point FFT:
     fft*                                Zeljko Lukac

+  Text Subtitles                        Clément Bœsch

 
 Codecs:
   4xm.c                                 Michael Niedermayer
 
 Codecs:
   4xm.c                                 Michael Niedermayer


@@ -165,6 +166,7 @@ Codecs:
   dnxhd*                                Baptiste Coudurier
   dpcm.c                                Mike Melanson
   dv.c                                  Roman Shaposhnik
   dnxhd*                                Baptiste Coudurier
   dpcm.c                                Mike Melanson
   dv.c                                  Roman Shaposhnik

+  dvbsubdec.c                           Anshul Maheshwari

   dxa.c                                 Kostya Shishkov
   eacmv*, eaidct*, eat*                 Peter Ross
   exif.c, exif.h                        Thilo Borgmann
   dxa.c                                 Kostya Shishkov
   eacmv*, eaidct*, eat*                 Peter Ross
   exif.c, exif.h                        Thilo Borgmann