summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2012-11-22 00:08:58 +0200
committerwm4 <wm4@nowhere>2012-12-03 21:08:52 +0100
commit72205635abe7f240118658d934b5db871a184201 (patch)
tree795038dcb1595a7e77103c97608c8b51b8be9894 /DOCS
parent3486f59fe28efa81ce6951208b94cec91ad6cdb8 (diff)
downloadmpv-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 'DOCS')
-rw-r--r--DOCS/man/en/options.rst4
1 files changed, 0 insertions, 4 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index a7aa700786..1e24d2b071 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -2170,10 +2170,6 @@
--user-agent=<string>
Use <string> as user agent for HTTP streaming.
---utf8
- Tells mpv to handle the subtitle file as UTF-8. By default, the subtitle
- file encoding is guessed, and all text converted to UTF-8 internally.
-
-v
Increment verbosity level, one level for each ``-v`` found on the command
line.