Commit 41b7c75d authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

enable nut muxer

Originally committed as revision 10043 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 100d8eb8
......@@ -102,6 +102,7 @@ OBJS-$(CONFIG_MXF_DEMUXER) += mxf.o
OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o
OBJS-$(CONFIG_NULL_MUXER) += raw.o
OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o nut.o riff.o
OBJS-$(CONFIG_NUT_MUXER) += nutenc.o nut.o riff.o
OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o riff.o
OBJS-$(CONFIG_OGG_DEMUXER) += ogg2.o \
oggparsevorbis.o \
......
......@@ -117,7 +117,7 @@ void av_register_all(void)
REGISTER_DEMUXER (MXF, mxf);
REGISTER_DEMUXER (NSV, nsv);
REGISTER_MUXER (NULL, null);
REGISTER_DEMUXER (NUT, nut);
REGISTER_MUXDEMUX(NUT, nut);
REGISTER_DEMUXER (NUV, nuv);
REGISTER_DEMUXER (OGG, ogg);
REGISTER_MUXER (OGG, ogg);
......
......@@ -160,6 +160,7 @@ extern AVOutputFormat mpeg2vob_muxer;
extern AVOutputFormat mpegts_muxer;
extern AVOutputFormat mpjpeg_muxer;
extern AVOutputFormat null_muxer;
extern AVOutputFormat nut_muxer;
extern AVOutputFormat ogg_muxer;
extern AVOutputFormat pcm_alaw_muxer;
extern AVOutputFormat pcm_mulaw_muxer;
......
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