diff options
| author | wm4 <wm4@nowhere> | 2013-06-25 00:43:04 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-06-25 00:43:04 +0200 |
| commit | 403a266d466850621397c07e0b96cc2c493b2936 (patch) | |
| tree | 0835a0908b3df8cca8374d173c34e0bf7df7d842 /core/options.c | |
| parent | 536871d7e5848eb385b97202a33b9382b5e8ab0e (diff) | |
| parent | 54851d60614e912fc422658302d72811a31b80f8 (diff) | |
| download | mpv-403a266d466850621397c07e0b96cc2c493b2936.tar.bz2 mpv-403a266d466850621397c07e0b96cc2c493b2936.tar.xz | |
Merge branch 'sub_mess2'
...the return.
Diffstat (limited to 'core/options.c')
| -rw-r--r-- | core/options.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/options.c b/core/options.c index f3e262fc17..40c8527394 100644 --- a/core/options.c +++ b/core/options.c @@ -406,7 +406,6 @@ const m_option_t mp_opts[] = { // demuxer.c - select audio/sub file/demuxer OPT_STRING("audiofile", audio_stream, 0), OPT_INTRANGE("audiofile-cache", audio_stream_cache, 0, 50, 65536), - OPT_STRING("subfile", sub_stream, 0), OPT_STRING("demuxer", demuxer_name, 0), OPT_STRING("audio-demuxer", audio_demuxer_name, 0), OPT_STRING("sub-demuxer", sub_demuxer_name, 0), @@ -493,12 +492,11 @@ const m_option_t mp_opts[] = { OPT_STRING("subcp", sub_cp, 0), OPT_FLOAT("sub-delay", sub_delay, 0), OPT_FLOAT("subfps", sub_fps, 0), + OPT_FLOAT("sub-speed", sub_speed, 0), 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), @@ -789,6 +787,7 @@ const struct MPOpts mp_default_opts = { .audio_display = 1, .sub_visibility = 1, .sub_pos = 100, + .sub_speed = 1.0, .extension_parsing = 1, .audio_output_channels = MP_CHMAP_INIT_STEREO, .audio_output_format = -1, // AF_FORMAT_UNKNOWN @@ -804,7 +803,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", |