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 /libavformat/allformats.c | |
| parent | 04cfef21ff25e30005d3b2a42bc145324e580a2f (diff) | |
Properly separate native and libnut NUT (de)muxers.
Originally committed as revision 7891 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/allformats.c')
| -rw-r--r-- | libavformat/allformats.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |