Commit 9d4edf96 authored by Diego Biurrun's avatar Diego Biurrun

Make native and libnut NUT muxers mutually exclusive.

Originally committed as revision 10102 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a6ba65f7
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment