From a319c212bdefec27b3ee4055ad8555637a77e57a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 7 Nov 2007 22:04:00 +0000 Subject: [PATCH] Move external library registrations into a separate block after all native 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/allformats.c b/libavformat/allformats.c index cd435cd..5252997 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -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); -- 2.7.4