From f10a3cac0fe09d72071cad4d1a1e33fdd16f2245 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 12 Aug 2013 20:40:39 +0200 Subject: demux: move demux_mf before demux_subreader demux_subreader is quite aggressive, and sometimes detects random strings in EXIF as subtitle text. --- demux/demux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/demux/demux.c b/demux/demux.c index 3a8f8972d5..5ffd42a971 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -77,12 +77,12 @@ const demuxer_desc_t *const demuxer_list[] = { #endif &demuxer_desc_matroska, &demuxer_desc_lavf, - &demuxer_desc_subreader, + &demuxer_desc_mf, #ifdef CONFIG_MNG &demuxer_desc_mng, #endif - // auto-probe last, because it checks file-extensions only - &demuxer_desc_mf, + // Pretty aggressive, so should be last. + &demuxer_desc_subreader, /* Please do not add any new demuxers here. If you want to implement a new * demuxer, add it to libavformat, except for wrappers around external * libraries and demuxers requiring binary support. */ -- cgit v1.2.3