summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo van Poorten <ivop@euronet.nl>2008-01-07 23:53:57 +0000
committerIvo van Poorten <ivop@euronet.nl>2008-01-07 23:53:57 +0000
commit77c1d04dfe0ee1e17decdab9c1b91c674ac1278b (patch)
treec15cbefa11aa7722a026e367e481cc9f729c9bb7
parent670c78479d88c86ebf1828f31a5716c54d74d257 (diff)
LMLM4 demuxer
Originally committed as revision 11457 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Changelog1
-rw-r--r--MAINTAINERS1
2 files changed, 2 insertions, 0 deletions
diff --git a/Changelog b/Changelog
index f4c6f050d7..441ae1a204 100644
--- 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 37ca00412a..3a2dd36b23 100644
--- 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