Make native and libnut NUT muxers mutually exclusive.

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

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index a71f1bf3d53a755f60f81bd574f47e58b41bf98f..468dd3e5f57c13215e79463423395ac55c8af64c 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -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);