mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
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
This commit is contained in:
parent
325833091e
commit
a319c212bd
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user