diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-02-09 08:28:47 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-02-09 08:28:47 +0000 |
| commit | d7c592475de81d2129ece1017d7bc8f293b46160 (patch) | |
| tree | c9ba06c8bf056a28ba893fd21162de79ce81e7bf | |
| parent | 04cfef21ff25e30005d3b2a42bc145324e580a2f (diff) | |
Properly separate native and libnut NUT (de)muxers.
Originally committed as revision 7891 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | libavformat/Makefile | 8 | ||||
| -rw-r--r-- | libavformat/allformats.c | 3 | ||||
| -rw-r--r-- | libavformat/allformats.h | 3 | ||||
| -rw-r--r-- | libavformat/libnut.c | 4 |
5 files changed, 11 insertions, 10 deletions
@@ -562,7 +562,8 @@ audio_muxer_deps_any="audio_oss audio_beos" dc1394_demuxer_deps="dc1394" dv1394_demuxer_deps="dv1394" gxf_muxer_deps="gpl" -nut_muxer_deps="libnut" +libnut_demuxer_deps="libnut" +libnut_muxer_deps="libnut" ogg_muxer_deps="libogg" redir_demuxer_deps="network" rtp_muxer_deps="network" diff --git a/libavformat/Makefile b/libavformat/Makefile index 3f338c7647..2c2316daa2 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -165,13 +165,11 @@ OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o base64.o rtp_h264.o endif endif -ifeq ($(CONFIG_LIBNUT),yes) -OBJS-$(CONFIG_NUT_DEMUXER) += libnut.o riff.o -OBJS-$(CONFIG_NUT_MUXER) += libnut.o riff.o -else +OBJS-$(CONFIG_LIBNUT_DEMUXER) += libnut.o riff.o +OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o riff.o + OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o riff.o #OBJS-$(CONFIG_NUT_MUXER) += nutenc.o riff.o -endif NAME=avformat ifeq ($(BUILD_SHARED),yes) diff --git a/libavformat/allformats.c b/libavformat/allformats.c index f5b2acecf7..2dcecf5b9d 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -83,6 +83,8 @@ void av_register_all(void) REGISTER_MUXDEMUX(IMAGE2PIPE, image2pipe); REGISTER_DEMUXER (INGENIENT, ingenient); REGISTER_DEMUXER (IPMOVIE, ipmovie); + if (!ENABLE_NUT_DEMUXER) REGISTER_DEMUXER (LIBNUT, libnut); + REGISTER_MUXER (LIBNUT, libnut); REGISTER_MUXDEMUX(M4V, m4v); REGISTER_DEMUXER (MATROSKA, matroska); REGISTER_MUXDEMUX(MJPEG, mjpeg); @@ -109,7 +111,6 @@ void av_register_all(void) REGISTER_DEMUXER (NSV, nsv); REGISTER_MUXER (NULL, null); REGISTER_DEMUXER (NUT, nut); - REGISTER_MUXER (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 8aff3537b6..9e0e13e8a3 100644 --- a/libavformat/allformats.h +++ b/libavformat/allformats.h @@ -69,6 +69,8 @@ extern AVInputFormat imagepipe_demuxer; extern AVOutputFormat image_muxer; extern AVOutputFormat imagepipe_muxer; extern AVInputFormat ipmovie_demuxer; +extern AVInputFormat libnut_demuxer; +extern AVOutputFormat libnut_muxer; extern AVInputFormat matroska_demuxer; extern AVInputFormat mm_demuxer; extern AVInputFormat mmf_demuxer; @@ -96,7 +98,6 @@ extern AVInputFormat mtv_demuxer; extern AVInputFormat mxf_demuxer; extern AVInputFormat nsv_demuxer; extern AVInputFormat nut_demuxer; -extern AVOutputFormat nut_muxer; extern AVInputFormat nuv_demuxer; extern AVInputFormat ogg_demuxer; extern AVOutputFormat ogg_muxer; diff --git a/libavformat/libnut.c b/libavformat/libnut.c index d224d8d5c5..79a6fcaef3 100644 --- a/libavformat/libnut.c +++ b/libavformat/libnut.c @@ -123,7 +123,7 @@ static int nut_write_trailer(AVFormatContext * avf) { return 0; } -AVOutputFormat nut_muxer = { +AVOutputFormat libnut_muxer = { "nut", "nut format", "video/x-nut", @@ -270,7 +270,7 @@ static int nut_read_close(AVFormatContext *s) { return 0; } -AVInputFormat nut_demuxer = { +AVInputFormat libnut_demuxer = { "nut", "nut format", sizeof(NUTContext), |