[FFmpeg-cvslog] r10102 - trunk/libavformat/allformats.c

[diego]

Author: diego
Date: Mon Aug 13 10:33:03 2007
New Revision: 10102

Log:
Make native and libnut NUT muxers mutually exclusive.


Modified:
   trunk/libavformat/allformats.c

Modified: trunk/libavformat/allformats.c
==============================================================================
--- trunk/libavformat/allformats.c	(original)
+++ trunk/libavformat/allformats.c	Mon Aug 13 10:33:03 2007
@@ -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);