Make native and libnut NUT muxers mutually exclusive.
authorDiego Biurrun <diego@biurrun.de>
Mon, 13 Aug 2007 08:33:03 +0000 (08:33 +0000)
committerDiego Biurrun <diego@biurrun.de>
Mon, 13 Aug 2007 08:33:03 +0000 (08:33 +0000)
Originally committed as revision 10102 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/allformats.c

index a71f1bf..468dd3e 100644 (file)
@@ -89,7 +89,7 @@ void av_register_all(void)
     REGISTER_DEMUXER (INGENIENT, ingenient);
     REGISTER_DEMUXER (IPMOVIE, ipmovie);
     if (!ENABLE_NUT_DEMUXER) REGISTER_DEMUXER (LIBNUT, libnut);
-    REGISTER_MUXER   (LIBNUT, libnut);
+    if (!ENABLE_NUT_MUXER)   REGISTER_MUXER   (LIBNUT, libnut);
     REGISTER_MUXDEMUX(M4V, m4v);
     REGISTER_DEMUXER (MATROSKA, matroska);
     REGISTER_MUXDEMUX(MJPEG, mjpeg);