summaryrefslogtreecommitdiffstats
path: root/options/options.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-02 21:23:12 +0100
committerwm4 <wm4@nowhere>2015-02-02 21:23:12 +0100
commitc07e046bfa5a736ddf6c185b48cd1c6929840186 (patch)
tree33ba8244e1118c892cd5e3483198a411992fda65 /options/options.c
parentcf8fa2bdd4789248bb4407294e60fe21393633d8 (diff)
downloadmpv-c07e046bfa5a736ddf6c185b48cd1c6929840186.tar.bz2
mpv-c07e046bfa5a736ddf6c185b48cd1c6929840186.tar.xz
player: add external audio file auto-loading
Apparently some people want this. Not enabled by default. Fixes #967.
Diffstat (limited to 'options/options.c')
-rw-r--r--options/options.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/options/options.c b/options/options.c
index e5e5975224..4c2cde9a2d 100644
--- a/options/options.c
+++ b/options/options.c
@@ -328,6 +328,8 @@ const m_option_t mp_opts[] = {
OPT_FLAG("sub-fix-timing", sub_fix_timing, 0),
OPT_CHOICE("sub-auto", sub_auto, 0,
({"no", -1}, {"exact", 0}, {"fuzzy", 1}, {"all", 2})),
+ OPT_CHOICE("audio-file-auto", audiofile_auto, 0,
+ ({"no", -1}, {"exact", 0}, {"fuzzy", 1}, {"all", 2})),
OPT_INTRANGE("sub-pos", sub_pos, 0, 0, 100),
OPT_FLOATRANGE("sub-gauss", sub_gauss, 0, 0.0, 3.0),
OPT_FLAG("sub-gray", sub_gray, 0),
@@ -764,6 +766,7 @@ const struct MPOpts mp_default_opts = {
.movie_aspect = -1.,
.field_dominance = -1,
.sub_auto = 0,
+ .audiofile_auto = -1,
.osd_bar_visible = 1,
#if HAVE_LIBASS
.ass_enabled = 1,