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 --- sub/sub.c | 1 - 1 file changed, 1 deletion(-) (limited to 'sub/sub.c') diff --git a/sub/sub.c b/sub/sub.c index 0dae442aee..56d85141a7 100644 --- a/sub/sub.c +++ b/sub/sub.c @@ -58,7 +58,6 @@ char * const sub_osd_names[]={ }; char * const sub_osd_names_short[] ={ "", "|>", "||", "[]", "<<" , ">>", "", "", "", "", "", "", "" }; -int sub_utf8=0; int sub_pos=100; int sub_visibility=1; -- cgit v1.2.3