summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-05-04 10:31:24 +0200
committerwm4 <wm4@nowhere>2014-05-04 10:31:24 +0200
commit94441ed13963356fa25f7e52a12e36387220ebba (patch)
treeae240ca341bf05447b35d5c74dcb8e54e9addb6d /player
parentf26fe90c8af7fe9d394ab4d000de9d34796ba05c (diff)
downloadmpv-94441ed13963356fa25f7e52a12e36387220ebba.tar.bz2
mpv-94441ed13963356fa25f7e52a12e36387220ebba.tar.xz
options: merge ---sub-auto-match with --sub-auto
There's no reason why these should be separate.
Diffstat (limited to 'player')
-rw-r--r--player/loadfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index 6319d092ce..e460c0ac69 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -714,7 +714,7 @@ static void open_subtitles_from_options(struct MPContext *mpctx)
for (int i = 0; mpctx->opts->sub_name[i] != NULL; ++i)
mp_add_subtitles(mpctx, mpctx->opts->sub_name[i]);
}
- if (mpctx->opts->sub_auto) { // auto load sub file ...
+ if (mpctx->opts->sub_auto >= 0) { // auto load sub file ...
void *tmp = talloc_new(NULL);
char *base_filename = mpctx->filename;
char *stream_filename = NULL;