From 41b7c75db34ed4d02e50c666cd24ec70d3ad1242 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 10 Aug 2007 00:12:54 +0000 Subject: [PATCH] enable nut muxer Originally committed as revision 10043 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/Makefile | 1 + libavformat/allformats.c | 2 +- libavformat/allformats.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 4263719045..794d2126e2 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -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 \ diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 6c5f6de7c3..de4a5cf70b 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -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); diff --git a/libavformat/allformats.h b/libavformat/allformats.h index fec5038580..73e942a436 100644 --- a/libavformat/allformats.h +++ b/libavformat/allformats.h @@ -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;