diff options
author | wm4 <wm4@nowhere> | 2014-06-13 02:06:03 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-06-13 02:06:03 +0200 |
commit | 09a61ba03ab0918d045d02427ccdc775abc38f03 (patch) | |
tree | 53ba982e49f8ddd41130744eeded4515e06fddaa /options | |
parent | 98a31d5937e8397d8fcd0fefe56630a1cd765cf0 (diff) | |
download | mpv-09a61ba03ab0918d045d02427ccdc775abc38f03.tar.bz2 mpv-09a61ba03ab0918d045d02427ccdc775abc38f03.tar.xz |
options: remove use of an inverted option value
Now MPOpts.sub_fix_timing corresponds to the commandline switch
directly, instead of storing the inverted value.
Diffstat (limited to 'options')
-rw-r--r-- | options/options.c | 4 | ||||
-rw-r--r-- | options/options.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/options/options.c b/options/options.c index dfa5106658..5f2ca9687d 100644 --- a/options/options.c +++ b/options/options.c @@ -302,7 +302,7 @@ const m_option_t mp_opts[] = { OPT_FLAG("sub-visibility", sub_visibility, 0), OPT_FLAG("sub-forced-only", forced_subs_only, 0), OPT_FLAG("stretch-dvd-subs", stretch_dvd_subs, 0), - OPT_FLAG_CONSTANTS("sub-fix-timing", suboverlap_enabled, 0, 1, 0), + 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_INTRANGE("sub-pos", sub_pos, 0, 0, 100), @@ -617,7 +617,7 @@ const struct MPOpts mp_default_opts = { .ass_style_override = 1, .ass_shaper = 1, .use_embedded_fonts = 1, - .suboverlap_enabled = 0, + .sub_fix_timing = 1, #if HAVE_ENCA .sub_cp = "enca", #else diff --git a/options/options.h b/options/options.h index b93a283b61..801ea36ac2 100644 --- a/options/options.h +++ b/options/options.h @@ -175,8 +175,7 @@ typedef struct MPOpts { char *quvi_format; int quvi_fetch_subtitles; - // subreader.c - int suboverlap_enabled; + int sub_fix_timing; char *sub_cp; char *audio_stream; |