Commit 9145021d authored by Ramiro Polla's avatar Ramiro Polla
Browse files

Add raw MLP muxer.

Originally committed as revision 18652 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 420df930
...@@ -89,6 +89,7 @@ OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o riff.o isom ...@@ -89,6 +89,7 @@ OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o riff.o isom
OBJS-$(CONFIG_MJPEG_DEMUXER) += raw.o OBJS-$(CONFIG_MJPEG_DEMUXER) += raw.o
OBJS-$(CONFIG_MJPEG_MUXER) += raw.o OBJS-$(CONFIG_MJPEG_MUXER) += raw.o
OBJS-$(CONFIG_MLP_DEMUXER) += raw.o id3v2.o OBJS-$(CONFIG_MLP_DEMUXER) += raw.o id3v2.o
OBJS-$(CONFIG_MLP_MUXER) += raw.o
OBJS-$(CONFIG_MM_DEMUXER) += mm.o OBJS-$(CONFIG_MM_DEMUXER) += mm.o
OBJS-$(CONFIG_MMF_DEMUXER) += mmf.o raw.o OBJS-$(CONFIG_MMF_DEMUXER) += mmf.o raw.o
OBJS-$(CONFIG_MMF_MUXER) += mmf.o riff.o OBJS-$(CONFIG_MMF_MUXER) += mmf.o riff.o
......
...@@ -102,7 +102,7 @@ void av_register_all(void) ...@@ -102,7 +102,7 @@ void av_register_all(void)
REGISTER_MUXDEMUX (MATROSKA, matroska); REGISTER_MUXDEMUX (MATROSKA, matroska);
REGISTER_MUXER (MATROSKA_AUDIO, matroska_audio); REGISTER_MUXER (MATROSKA_AUDIO, matroska_audio);
REGISTER_MUXDEMUX (MJPEG, mjpeg); REGISTER_MUXDEMUX (MJPEG, mjpeg);
REGISTER_DEMUXER (MLP, mlp); REGISTER_MUXDEMUX (MLP, mlp);
REGISTER_DEMUXER (MM, mm); REGISTER_DEMUXER (MM, mm);
REGISTER_MUXDEMUX (MMF, mmf); REGISTER_MUXDEMUX (MMF, mmf);
REGISTER_MUXDEMUX (MOV, mov); REGISTER_MUXDEMUX (MOV, mov);
......
...@@ -973,6 +973,21 @@ AVInputFormat mlp_demuxer = { ...@@ -973,6 +973,21 @@ AVInputFormat mlp_demuxer = {
}; };
#endif #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 #if CONFIG_TRUEHD_DEMUXER
AVInputFormat truehd_demuxer = { AVInputFormat truehd_demuxer = {
"truehd", "truehd",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment