diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-11-07 22:04:00 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-11-07 22:04:00 +0000 |
| commit | a319c212bdefec27b3ee4055ad8555637a77e57a (patch) | |
| tree | 1a3e704a37d34fb92b27d465ab5ea2fbd083192c /libavformat/allformats.c | |
| parent | 325833091e52134e37755041a39fdff02f007efa (diff) | |
| download | ffmpeg-a319c212bdefec27b3ee4055ad8555637a77e57a.tar.gz | |
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
Diffstat (limited to 'libavformat/allformats.c')
| -rw-r--r-- | libavformat/allformats.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index cd435cd844..52529974d1 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); |