Commit a61c4d9f authored by michael's avatar michael

enable nut muxer


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@10043 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 7eb07c44
...@@ -102,6 +102,7 @@ OBJS-$(CONFIG_MXF_DEMUXER) += mxf.o ...@@ -102,6 +102,7 @@ OBJS-$(CONFIG_MXF_DEMUXER) += mxf.o
OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o
OBJS-$(CONFIG_NULL_MUXER) += raw.o OBJS-$(CONFIG_NULL_MUXER) += raw.o
OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o nut.o riff.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_NUV_DEMUXER) += nuv.o riff.o
OBJS-$(CONFIG_OGG_DEMUXER) += ogg2.o \ OBJS-$(CONFIG_OGG_DEMUXER) += ogg2.o \
oggparsevorbis.o \ oggparsevorbis.o \
......
...@@ -117,7 +117,7 @@ void av_register_all(void) ...@@ -117,7 +117,7 @@ void av_register_all(void)
REGISTER_DEMUXER (MXF, mxf); REGISTER_DEMUXER (MXF, mxf);
REGISTER_DEMUXER (NSV, nsv); REGISTER_DEMUXER (NSV, nsv);
REGISTER_MUXER (NULL, null); REGISTER_MUXER (NULL, null);
REGISTER_DEMUXER (NUT, nut); REGISTER_MUXDEMUX(NUT, nut);
REGISTER_DEMUXER (NUV, nuv); REGISTER_DEMUXER (NUV, nuv);
REGISTER_DEMUXER (OGG, ogg); REGISTER_DEMUXER (OGG, ogg);
REGISTER_MUXER (OGG, ogg); REGISTER_MUXER (OGG, ogg);
......
...@@ -160,6 +160,7 @@ extern AVOutputFormat mpeg2vob_muxer; ...@@ -160,6 +160,7 @@ extern AVOutputFormat mpeg2vob_muxer;
extern AVOutputFormat mpegts_muxer; extern AVOutputFormat mpegts_muxer;
extern AVOutputFormat mpjpeg_muxer; extern AVOutputFormat mpjpeg_muxer;
extern AVOutputFormat null_muxer; extern AVOutputFormat null_muxer;
extern AVOutputFormat nut_muxer;
extern AVOutputFormat ogg_muxer; extern AVOutputFormat ogg_muxer;
extern AVOutputFormat pcm_alaw_muxer; extern AVOutputFormat pcm_alaw_muxer;
extern AVOutputFormat pcm_mulaw_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