summaryrefslogtreecommitdiffstats
path: root/demux/demux.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-08-12 20:40:39 +0200
committerwm4 <wm4@nowhere>2013-08-12 20:40:39 +0200
commitd5f1b1638c1322991f7a81bd049f40aaf074bc83 (patch)
tree21f84a561c235491ec1cbcc3f45fb50261e5cc6c /demux/demux.c
parentb644fe3da6b27927beb6979db1fcfa702e0a9ccd (diff)
downloadmpv-d5f1b1638c1322991f7a81bd049f40aaf074bc83.tar.bz2
mpv-d5f1b1638c1322991f7a81bd049f40aaf074bc83.tar.xz
demux: move demux_mf before demux_subreader
demux_subreader is quite aggressive, and sometimes detects random strings in EXIF as subtitle text.
Diffstat (limited to 'demux/demux.c')
-rw-r--r--demux/demux.c6
1 files 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. */