summaryrefslogtreecommitdiffstats
path: root/core/mp_core.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-04-20 23:48:26 +0200
committerwm4 <wm4@nowhere>2013-04-20 23:48:26 +0200
commitc768a00dfe669b9406f9baba9c027cb1c9a19d6c (patch)
tree770b75c9066c5aaa8cc84a44db94dfe0a0d01f60 /core/mp_core.h
parent963c9aa3d5dc9514f6b4bdb9cc952454f2d83c3b (diff)
downloadmpv-c768a00dfe669b9406f9baba9c027cb1c9a19d6c.tar.bz2
mpv-c768a00dfe669b9406f9baba9c027cb1c9a19d6c.tar.xz
mplayer: prefer -sub/-subfile subs over auto-loaded subs
Before this commit, it was more or less random which subtitle was preferred if there was both an auto-loaded external subtitle, and a subtitle loaded via -sub or -subfile. -sub subtitles happened to be preferred over auto-loaded subs, while -subfile didn't. Fix the -subfile case, and make the behavior consistent by making the selection behavior explicit.
Diffstat (limited to 'core/mp_core.h')
-rw-r--r--core/mp_core.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/mp_core.h b/core/mp_core.h
index 10839eb177..452cf70d58 100644
--- a/core/mp_core.h
+++ b/core/mp_core.h
@@ -95,6 +95,7 @@ struct track {
// If this track is from an external file (e.g. subtitle file).
bool is_external;
char *external_filename;
+ bool auto_loaded;
// If the track's stream changes with the timeline (ordered chapters).
bool under_timeline;