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

1 files changed, 0 insertions, 2 deletions

diff --git a/sub/sub.h b/sub/sub.h
index 4fe052d8b2..0de36fedb5 100644
--- a/sub/sub.h
+++ b/sub/sub.h
@@ -195,8 +195,6 @@ extern const struct m_sub_options osd_style_conf;
 extern char * const sub_osd_names[];
 extern char * const sub_osd_names_short[];
 
-extern int sub_utf8;
-
 extern char *sub_cp;
 extern int sub_pos;