diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2009-04-21 23:23:15 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2009-04-21 23:23:15 +0000 |
| commit | 9145021d681346b6a1fcf8081e7241cec5635d9f (patch) | |
| tree | 45e7ff8f1c0ea5dc240d597b5061fb12c403a321 /libavformat | |
| parent | 420df9303775f40fd5e591c4da05527efce6752b (diff) | |
Add raw MLP muxer.
Originally committed as revision 18652 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/allformats.c | 2 | ||||
| -rw-r--r-- | libavformat/raw.c | 15 |
3 files changed, 17 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 4335332bd0..55717e69c2 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -89,6 +89,7 @@ OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o riff.o isom OBJS-$(CONFIG_MJPEG_DEMUXER) += raw.o OBJS-$(CONFIG_MJPEG_MUXER) += raw.o OBJS-$(CONFIG_MLP_DEMUXER) += raw.o id3v2.o +OBJS-$(CONFIG_MLP_MUXER) += 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 39ac3b82a6..e193af704d 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -102,7 +102,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_MUXDEMUX (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 a7267a04e2..40ac4440d6 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -973,6 +973,21 @@ AVInputFormat mlp_demuxer = { }; #endif +#ifdef CONFIG_MLP_MUXER +AVOutputFormat mlp_muxer = { + "mlp", + NULL_IF_CONFIG_SMALL("raw MLP"), + NULL, + "mlp", + 0, + CODEC_ID_MLP, + CODEC_ID_NONE, + NULL, + raw_write_packet, + .flags= AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_TRUEHD_DEMUXER AVInputFormat truehd_demuxer = { "truehd", |