enable nut muxer

Originally committed as revision 10043 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 4263719..794d212 100644 (file)
--- 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 6c5f6de..de4a5cf 100644 (file)
--- 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 fec5038..73e942a 100644 (file)
--- 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;