diff options
| author | wm4 <wm4@nowhere> | 2013-06-11 21:41:50 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-06-23 22:33:59 +0200 |
| commit | 64b1374a4456435cc4486a8153703fa89af58e31 (patch) | |
| tree | de0a0d9a04431856544ef1dc47398ca75f0ad383 /core | |
| parent | a70d575291d48289669ee8989e0597a94189dd8d (diff) | |
| download | mpv-64b1374a4456435cc4486a8153703fa89af58e31.tar.bz2 mpv-64b1374a4456435cc4486a8153703fa89af58e31.tar.xz | |
sub: do some timing postprocessing on preloaded subs
This fixes the -subfps option (which unfortunately is still useful),
and fixes minor annoying timing errors (which unfortunately still
happen).
Note that none of these affect ASS or image subtitles. ASS is specially
handled: libass loads subtitles as ASS_Track. There are no actual
packets passed around, and sd_ass just uses the ASS_Track.
Disable the --sub-no-text-pp option. It's misleading now and always was
completely useless.
Diffstat (limited to 'core')
| -rw-r--r-- | core/options.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/options.c b/core/options.c index f3e262fc17..2e0d32bb60 100644 --- a/core/options.c +++ b/core/options.c @@ -496,9 +496,7 @@ const m_option_t mp_opts[] = { OPT_FLAG("autosub", sub_auto, 0), OPT_FLAG("sub-visibility", sub_visibility, 0), OPT_FLAG("sub-forced-only", forced_subs_only, 0), - // enable Closed Captioning display - OPT_FLAG_CONSTANTS("overlapsub", suboverlap_enabled, 0, 0, 2), - OPT_FLAG_STORE("sub-no-text-pp", sub_no_text_pp, 0, 1), + OPT_FLAG_CONSTANTS("sub-fix-timing", suboverlap_enabled, 0, 1, 0), OPT_CHOICE("autosub-match", sub_match_fuzziness, 0, ({"exact", 0}, {"fuzzy", 1}, {"all", 2})), OPT_INTRANGE("sub-pos", sub_pos, 0, 0, 100), @@ -804,7 +802,7 @@ const struct MPOpts mp_default_opts = { .ass_vsfilter_aspect_compat = 1, .ass_style_override = 1, .use_embedded_fonts = 1, - .suboverlap_enabled = 1, + .suboverlap_enabled = 0, .hwdec_codecs = "all", |