From 9d4edf966e39d77ffc3b085d1081c97ad85696f6 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Mon, 13 Aug 2007 08:33:03 +0000
Subject: [PATCH] Make native and libnut NUT muxers mutually exclusive.
Originally committed as revision 10102 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/allformats.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
--
GitLab