diff options
| author | wm4 <wm4@nowhere> | 2012-12-08 13:59:49 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-12-11 00:37:54 +0100 |
| commit | 5bf8706d1f6536cd89207b777161ab83195ddb20 (patch) | |
| tree | 1e4ba07a00da6dcde3f8f308f2aa1128af56619e /core/cfg-mplayer.h | |
| parent | b3fb7c2cade9d70a4ca05821c87f68e941da6237 (diff) | |
| download | mpv-5bf8706d1f6536cd89207b777161ab83195ddb20.tar.bz2 mpv-5bf8706d1f6536cd89207b777161ab83195ddb20.tar.xz | |
sub: remove vobsub reader in favor of ffmpeg vobsub demuxer
ffmpeg recently added a demuxer that can read vobsubs (pairs of .sub and
.idx files). Get rid of the internal vobsub reader, and use the ffmpeg
demuxer instead.
Sneak in an unrelated manpage change (autosub default).
Diffstat (limited to 'core/cfg-mplayer.h')
| -rw-r--r-- | core/cfg-mplayer.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index 310405dee2..6534672223 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -498,8 +498,6 @@ const m_option_t common_opts[] = { {"subfps", &sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0, NULL}, OPT_MAKE_FLAGS("autosub", sub_auto, 0), {"sub-forced-only", &forced_subs_only, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - // specify IFO file for VOBSUB subtitle - {"ifo", &spudec_ifo, CONF_TYPE_STRING, 0, 0, 0, NULL}, // enable Closed Captioning display {"overlapsub", &suboverlap_enabled, CONF_TYPE_FLAG, 0, 0, 2, NULL}, {"sub-no-text-pp", &sub_no_text_pp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, @@ -649,9 +647,6 @@ const m_option_t mplayer_opts[]={ OPT_INTRANGE("osd-duration", osd_duration, 0, 0, 3600000), OPT_MAKE_FLAGS("osd-fractions", osd_fractions, 0), - OPT_STRING("vobsub", vobsub_name, 0), - {"vobsubid", &vobsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL}, - {"sstep", &step_sec, CONF_TYPE_DOUBLE, CONF_MIN, 0, 0, NULL}, OPT_CHOICE("framedrop", frame_dropping, 0, |