Commit a319c212 authored by Diego Biurrun's avatar Diego Biurrun

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
parent 32583309
...@@ -92,8 +92,6 @@ void av_register_all(void) ...@@ -92,8 +92,6 @@ void av_register_all(void)
REGISTER_MUXDEMUX (IMAGE2PIPE, image2pipe); REGISTER_MUXDEMUX (IMAGE2PIPE, image2pipe);
REGISTER_DEMUXER (INGENIENT, ingenient); REGISTER_DEMUXER (INGENIENT, ingenient);
REGISTER_DEMUXER (IPMOVIE, ipmovie); REGISTER_DEMUXER (IPMOVIE, ipmovie);
REGISTER_DEMUXER (LIBDC1394, libdc1394);
REGISTER_MUXDEMUX (LIBNUT, libnut);
REGISTER_MUXDEMUX (M4V, m4v); REGISTER_MUXDEMUX (M4V, m4v);
REGISTER_MUXDEMUX (MATROSKA, matroska); REGISTER_MUXDEMUX (MATROSKA, matroska);
REGISTER_MUXER (MATROSKA_AUDIO, matroska_audio); REGISTER_MUXER (MATROSKA_AUDIO, matroska_audio);
...@@ -171,6 +169,10 @@ void av_register_all(void) ...@@ -171,6 +169,10 @@ void av_register_all(void)
REGISTER_DEMUXER (X11_GRAB_DEVICE, x11_grab_device); REGISTER_DEMUXER (X11_GRAB_DEVICE, x11_grab_device);
REGISTER_MUXDEMUX (YUV4MPEGPIPE, yuv4mpegpipe); REGISTER_MUXDEMUX (YUV4MPEGPIPE, yuv4mpegpipe);
/* external libraries */
REGISTER_DEMUXER (LIBDC1394, libdc1394);
REGISTER_MUXDEMUX (LIBNUT, libnut);
/* protocols */ /* protocols */
REGISTER_PROTOCOL (FILE, file); REGISTER_PROTOCOL (FILE, file);
REGISTER_PROTOCOL (HTTP, http); REGISTER_PROTOCOL (HTTP, http);
......
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