diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-08-13 08:33:03 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-08-13 08:33:03 +0000 |
| commit | 9d4edf966e39d77ffc3b085d1081c97ad85696f6 (patch) | |
| tree | 33cbc80a984e1af39f2a90b0a05d0cd7bd84a0a3 | |
| parent | a6ba65f7f282e220f3aae067a89ceedbb3328528 (diff) | |
| download | ffmpeg-9d4edf966e39d77ffc3b085d1081c97ad85696f6.tar.gz | |
Make native and libnut NUT muxers mutually exclusive.
Originally committed as revision 10102 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/allformats.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index a71f1bf3d5..468dd3e5f5 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); |