diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2008-05-30 16:05:56 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2008-05-30 16:05:56 +0000 |
| commit | 16e861e3eef2d6f5e98337bfb3c6dbf093037c98 (patch) | |
| tree | 49fea83e507b7e0c055c22936bc6aa1ef89b1c34 /libavformat | |
| parent | dd0f776c98c8635772d78269e90451205e4549a0 (diff) | |
| download | ffmpeg-16e861e3eef2d6f5e98337bfb3c6dbf093037c98.tar.gz | |
raw mlp demuxer
Based on patch by Jeff Muizelaar <jrmuizel <at> gmail.org>
http://article.gmane.org/gmane.comp.video.ffmpeg.devel/57797
Originally committed as revision 13558 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/allformats.c | 1 | ||||
| -rw-r--r-- | libavformat/raw.c | 13 |
3 files changed, 15 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 3b9f3f6449..6abe6a1faa 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -80,6 +80,7 @@ OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o riff.o OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o riff.o avc.o OBJS-$(CONFIG_MJPEG_DEMUXER) += raw.o OBJS-$(CONFIG_MJPEG_MUXER) += raw.o +OBJS-$(CONFIG_MLP_DEMUXER) += raw.o OBJS-$(CONFIG_MM_DEMUXER) += mm.o OBJS-$(CONFIG_MMF_DEMUXER) += mmf.o raw.o OBJS-$(CONFIG_MMF_MUXER) += mmf.o riff.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 1dcfa7acf8..4a3b5f1a42 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -100,6 +100,7 @@ void av_register_all(void) REGISTER_MUXDEMUX (MATROSKA, matroska); REGISTER_MUXER (MATROSKA_AUDIO, matroska_audio); REGISTER_MUXDEMUX (MJPEG, mjpeg); + REGISTER_DEMUXER (MLP, mlp); REGISTER_DEMUXER (MM, mm); REGISTER_MUXDEMUX (MMF, mmf); REGISTER_MUXDEMUX (MOV, mov); diff --git a/libavformat/raw.c b/libavformat/raw.c index ed629fa178..db427c0299 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -442,6 +442,19 @@ AVInputFormat shorten_demuxer = { .value = CODEC_ID_SHORTEN, }; +AVInputFormat mlp_demuxer = { + "mlp", + "raw mlp", + 0, + NULL, + audio_read_header, + raw_read_partial_packet, + raw_read_close, + .flags= AVFMT_GENERIC_INDEX, + .extensions = "mlp", + .value = CODEC_ID_MLP, +}; + AVInputFormat flac_demuxer = { "flac", "raw flac", |