use packet dts as correct media field number and use av_interleave_pkt_per_dts

[ffmpeg] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 45e3dfa450c68338b24369f320a5ed922d297a1f..b0c7cc6ac24caa0ed9e86bb755d0006cfcf21540 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -20,7 +20,7 @@ ffmpeg:
 
   Video Hooks:
     vhook
 
   Video Hooks:
     vhook

-    vhook/watermark.c
+    vhook/watermark.c                   Marcus Engene

     vhook/ppm.c
     vhook/drawtext.c
     vhook/fish.c
     vhook/ppm.c
     vhook/drawtext.c
     vhook/fish.c


@@ -45,7 +45,8 @@ Miscellaneous Areas
 
 documentation                           Mike Melanson, Diego Biurrun
 website                                 Mike Melanson, Diego Biurrun
 
 documentation                           Mike Melanson, Diego Biurrun
 website                                 Mike Melanson, Diego Biurrun

-build system (configure,Makefiles)      Diego Biurrun
+build system (configure,Makefiles)      Diego Biurrun, Mans Rullgard
+project server                          Diego Biurrun, Mans Rullgard

 
 
 libavutil
 
 
 libavutil


@@ -103,8 +104,10 @@ Generic Parts:
 Codecs:
   4xm.c                                 Michael Niedermayer
   8bps.c                                Roberto Togni
 Codecs:
   4xm.c                                 Michael Niedermayer
   8bps.c                                Roberto Togni

+  aasc.c                                Kostya Shishkov

   asv*                                  Michael Niedermayer
   bmp.c                                 Mans Rullgard
   asv*                                  Michael Niedermayer
   bmp.c                                 Mans Rullgard

+  cavs*                                 Stefan Gehrer

   cinepak.c                             Roberto Togni
   cljr                                  Alex Beregszaszi
   cook.c, cookdata.h                    Benjamin Larsson
   cinepak.c                             Roberto Togni
   cljr                                  Alex Beregszaszi
   cook.c, cookdata.h                    Benjamin Larsson


@@ -113,6 +116,7 @@ Codecs:
   dv.c                                  Roman Shaposhnik
   ffv1.c                                Michael Niedermayer
   flac.c                                Alex Beregszaszi
   dv.c                                  Roman Shaposhnik
   ffv1.c                                Michael Niedermayer
   flac.c                                Alex Beregszaszi

+  flacenc.c                             Justin Ruggles

   flicvideo.c                           Mike Melanson
   g726.c                                Roman Shaposhnik
   h264*                                 Loren Merritt, Michael Niedermayer
   flicvideo.c                           Mike Melanson
   g726.c                                Roman Shaposhnik
   h264*                                 Loren Merritt, Michael Niedermayer


@@ -120,8 +124,12 @@ Codecs:
   h263*                                 Michael Niedermayer
   huffyuv.c                             Michael Niedermayer
   idcinvideo.c                          Mike Melanson
   h263*                                 Michael Niedermayer
   huffyuv.c                             Michael Niedermayer
   idcinvideo.c                          Mike Melanson

+  indeo2*                               Kostya Shishkov

   interplayvideo.c                      Mike Melanson
   interplayvideo.c                      Mike Melanson

+  jpeg_ls.c                             Kostya Shishkov
+  kmvc.c                                Kostya Shishkov

   lcl.c                                 Roberto Togni
   lcl.c                                 Roberto Togni

+  loco.c                                Kostya Shishkov

   lzo.h, lzo.c                          Reimar Doeffinger
   mdec.c                                Michael Niedermayer
   mjpeg.c                               Michael Niedermayer
   lzo.h, lzo.c                          Reimar Doeffinger
   mdec.c                                Michael Niedermayer
   mjpeg.c                               Michael Niedermayer


@@ -130,25 +138,37 @@ Codecs:
   msmpeg4.c, msmpeg4data.h              Michael Niedermayer
   msrle.c                               Mike Melanson
   msvideo1.c                            Mike Melanson
   msmpeg4.c, msmpeg4data.h              Michael Niedermayer
   msrle.c                               Mike Melanson
   msvideo1.c                            Mike Melanson

+  nuv.c                                 Reimar Doeffinger

   oggtheora.c                           Mans Rullgard
   qdm2.c, qdm2data.h                    Roberto Togni
   oggtheora.c                           Mans Rullgard
   qdm2.c, qdm2data.h                    Roberto Togni

+  qdrw.c                                Kostya Shishkov
+  qpeg.c                                Kostya Shishkov

   qtrle.c                               Mike Melanson
   ra144.c, ra144.h, ra288.c, ra288.h    Roberto Togni
   resample2.c                           Michael Niedermayer
   rpza.c                                Roberto Togni
   qtrle.c                               Mike Melanson
   ra144.c, ra144.h, ra288.c, ra288.h    Roberto Togni
   resample2.c                           Michael Niedermayer
   rpza.c                                Roberto Togni

+  rtjpeg.c, rtjpeg.h                    Reimar Doeffinger

   rv10.c                                Michael Niedermayer
   smc.c                                 Mike Melanson
   snow.c                                Michael Niedermayer, Loren Merritt
   sonic.c                               Alex Beregszaszi
   svq3.c                                Michael Niedermayer
   rv10.c                                Michael Niedermayer
   smc.c                                 Mike Melanson
   snow.c                                Michael Niedermayer, Loren Merritt
   sonic.c                               Alex Beregszaszi
   svq3.c                                Michael Niedermayer

-  truemotion*                           Mike Melanson
+  truemotion1*                          Mike Melanson
+  truemotion2*                          Kostya Shishkov
+  truespeech.c                          Kostya Shishkov
+  tscc.c                                Kostya Shishkov
+  ulti*                                 Kostya Shishkov
+  vc1*                                  Kostya Shishkov

   vcr1.c                                Michael Niedermayer
   vp3*                                  Mike Melanson
   vqavideo.c                            Mike Melanson
   wmv2.c                                Michael Niedermayer
   vcr1.c                                Michael Niedermayer
   vp3*                                  Mike Melanson
   vqavideo.c                            Mike Melanson
   wmv2.c                                Michael Niedermayer

+  wnv1.c                                Kostya Shishkov

   x264.c                                Mans Rullgard
   xan.c                                 Mike Melanson
   x264.c                                Mans Rullgard
   xan.c                                 Mike Melanson

+  xl.c                                  Kostya Shishkov

   xvmcvideo.c                           Ivan Kalvachev
   xvmcvideo.c                           Ivan Kalvachev

+  zmbv.c                                Kostya Shishkov

 
 
 libavformat
 
 
 libavformat


@@ -170,20 +190,26 @@ Muxers/Demuxers:
   dc1394.c, dv.c                        Roman Shaposhnik
   flic.c                                Mike Melanson
   flvdec.c, flvenc.c                    Michael Niedermayer
   dc1394.c, dv.c                        Roman Shaposhnik
   flic.c                                Mike Melanson
   flvdec.c, flvenc.c                    Michael Niedermayer

+  gxf.c                                 Reimar Doeffinger
+  gxfenc.c                              Baptiste Coudurier

   idcin.c                               Mike Melanson
   idroq.c                               Mike Melanson
   ipmovie.c                             Mike Melanson
   img2.c                                Michael Niedermayer
   mov.c                                 Francois Revol, Michael Niedermayer
   mpegts*                               Mans Rullgard
   idcin.c                               Mike Melanson
   idroq.c                               Mike Melanson
   ipmovie.c                             Mike Melanson
   img2.c                                Michael Niedermayer
   mov.c                                 Francois Revol, Michael Niedermayer
   mpegts*                               Mans Rullgard

+  mxf.c                                 Baptiste Coudurier

   nsvdec.c                              Francois Revol
   nut.c                                 Alex Beregszaszi
   nsvdec.c                              Francois Revol
   nut.c                                 Alex Beregszaszi

+  nuv.c                                 Reimar Doeffinger

   ogg2.c, ogg2.h                        Mans Rullgard
   oggparsevorbis.c                      Mans Rullgard
   ogg2.c, ogg2.h                        Mans Rullgard
   oggparsevorbis.c                      Mans Rullgard

+  oggparseogm.c                         Mans Rullgard

   psxstr.c                              Mike Melanson
   raw.c                                 Michael Niedermayer
   rm.c                                  Roberto Togni
   segafilm.c                            Mike Melanson
   psxstr.c                              Mike Melanson
   raw.c                                 Michael Niedermayer
   rm.c                                  Roberto Togni
   segafilm.c                            Mike Melanson

+  v4l2.c                                Luca Abeni

   voc.c                                 Aurelien Jacobs
   wav.c                                 Michael Niedermayer
   wc3movie.c                            Mike Melanson
   voc.c                                 Aurelien Jacobs
   wav.c                                 Michael Niedermayer
   wc3movie.c                            Mike Melanson


@@ -198,3 +224,4 @@ BeOS                                    Francois Revol
 i386                                    Michael Niedermayer
 Mac OS X / PowerPC                      Romain Dolbeau
 Amiga / PowerPC                         Colin Ward
 i386                                    Michael Niedermayer
 Mac OS X / PowerPC                      Romain Dolbeau
 Amiga / PowerPC                         Colin Ward

+Linux / PowerPC                         Luca Barbato