From: Diego Biurrun <diego@biurrun.de>
Date: Mon, 13 Aug 2007 08:33:03 +0000 (+0000)
Subject: Make native and libnut NUT muxers mutually exclusive.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=9d4edf966e39d77ffc3b085d1081c97ad85696f6;p=ffmpeg

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 a71f1bf3d53..468dd3e5f57 100644
--- 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);