LMLM4 demuxer

Originally committed as revision 11457 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Changelog b/Changelog
index f4c6f05..441ae1a 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -108,6 +108,7 @@ version <next>
 - PC Paintbrush PCX decoder
 - Sun Rasterfile decoder
 - TechnoTrend PVA demuxer
+- Linux Media Labs MPEG-4 (LMLM4) demuxer
 
 version 0.4.9-pre1:
 

diff --git a/MAINTAINERS b/MAINTAINERS
index 37ca004..3a2dd36 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -230,6 +230,7 @@ Muxers/Demuxers:
   ipmovie.c                             Mike Melanson
   img2.c                                Michael Niedermayer
   libnut.c                              Oded Shimon
+  lmlm4.c                               Ivo van Poorten
   matroska.c                            Aurelien Jacobs
   matroskaenc.c                         David Conrad
   mov.c                                 Michael Niedermayer, Baptiste Coudurier