diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2012-11-22 00:08:58 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-12-03 21:08:52 +0100 |
| commit | 72205635abe7f240118658d934b5db871a184201 (patch) | |
| tree | 795038dcb1595a7e77103c97608c8b51b8be9894 /core/cfg-mplayer.h | |
| parent | 3486f59fe28efa81ce6951208b94cec91ad6cdb8 (diff) | |
| download | mpv-72205635abe7f240118658d934b5db871a184201.tar.bz2 mpv-72205635abe7f240118658d934b5db871a184201.tar.xz | |
subs: remove --utf8, simplify code
Remove the options --utf8 and --unicode which had no effect any more
(what they once did should be doable with --subcp). The only use of
corresponding variables left in code was subreader.c code using
sub_utf8 as a flag indicating whether iconv conversion was active.
Change the code to test the existence of iconv context instead.
Conflicts:
DOCS/man/en/options.rst
core/cfg-mplayer.h
sub/sub.c
sub/sub.h
sub/subreader.c
Merged from mplayer2 commit ea7311.
Note: --unicode was already removed
Diffstat (limited to 'core/cfg-mplayer.h')
| -rw-r--r-- | core/cfg-mplayer.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index 03432c8e04..1c086fcb1f 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -497,8 +497,7 @@ const m_option_t common_opts[] = { {"sub-delay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0, NULL}, {"subfps", &sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0, NULL}, OPT_MAKE_FLAGS("autosub", sub_auto, 0), - {"utf8", &sub_utf8, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"sub-forced-only", &forced_subs_only, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"forcedsubsonly", &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 |