From 72205635abe7f240118658d934b5db871a184201 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Thu, 22 Nov 2012 00:08:58 +0200 Subject: 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 --- DOCS/man/en/options.rst | 4 ---- 1 file changed, 4 deletions(-) (limited to 'DOCS') 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= Use 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. -- cgit v1.2.3