Commit a0d104e6 authored by diego's avatar diego

Make native and libnut NUT muxers mutually exclusive.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@10102 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 9a6ab8c8
......@@ -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