# HG changeset patch
# User ib
# Date 1390418528 0
# Node ID 63661fc7b53bf0f35d8f993e15dfcadbe50e9171
# Parent  595879066f26414ffc4ade59ab144e62a668b8fa
Fix handling of option 'subfont-encoding'.

If variable unicode hasn't been set true, there *is* a
subtitle_font_encoding, so it's pointless to have a fallback
to "iso-8859-1".

Remove this fallback and simplify the code.

diff -r 595879066f26 -r 63661fc7b53b sub/font_load_ft.c
--- a/sub/font_load_ft.c	Wed Jan 22 19:11:03 2014 +0000
+++ b/sub/font_load_ft.c	Wed Jan 22 19:22:08 2014 +0000
@@ -1004,15 +1004,10 @@
     desc->face_cnt++;
 
 #ifdef CONFIG_ICONV
-    if (unicode) {
+    if (unicode)
 	charset_size = prepare_charset_unicode(face, my_charset, my_charcodes);
-    } else {
-	if (subtitle_font_encoding) {
-	    charset_size = prepare_charset(charmap, subtitle_font_encoding, my_charset, my_charcodes);
-	} else {
-	    charset_size = prepare_charset(charmap, "iso-8859-1", my_charset, my_charcodes);
-	}
-    }
+    else
+	charset_size = prepare_charset(charmap, subtitle_font_encoding, my_charset, my_charcodes);
 
     if (charset_size < 0) {
 	mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_SubFontCharsetFailed);