]> git.sesse.net Git - ffmpeg/commitdiff
Move external library registrations into a separate block after all native
authorDiego Biurrun <diego@biurrun.de>
Wed, 7 Nov 2007 22:04:00 +0000 (22:04 +0000)
committerDiego Biurrun <diego@biurrun.de>
Wed, 7 Nov 2007 22:04:00 +0000 (22:04 +0000)
implementations so that the latter ones are preferred by default.

Originally committed as revision 10945 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/allformats.c

index cd435cd84464b320bc2c0b02dbda8fbb37837e82..52529974d1df763bee6d582c16a5afbefc8cd71f 100644 (file)
@@ -92,8 +92,6 @@ void av_register_all(void)
     REGISTER_MUXDEMUX (IMAGE2PIPE, image2pipe);
     REGISTER_DEMUXER  (INGENIENT, ingenient);
     REGISTER_DEMUXER  (IPMOVIE, ipmovie);
-    REGISTER_DEMUXER  (LIBDC1394, libdc1394);
-    REGISTER_MUXDEMUX (LIBNUT, libnut);
     REGISTER_MUXDEMUX (M4V, m4v);
     REGISTER_MUXDEMUX (MATROSKA, matroska);
     REGISTER_MUXER    (MATROSKA_AUDIO, matroska_audio);
@@ -171,6 +169,10 @@ void av_register_all(void)
     REGISTER_DEMUXER  (X11_GRAB_DEVICE, x11_grab_device);
     REGISTER_MUXDEMUX (YUV4MPEGPIPE, yuv4mpegpipe);
 
+    /* external libraries */
+    REGISTER_DEMUXER  (LIBDC1394, libdc1394);
+    REGISTER_MUXDEMUX (LIBNUT, libnut);
+
     /* protocols */
     REGISTER_PROTOCOL (FILE, file);
     REGISTER_PROTOCOL (HTTP, http);