[MPlayer-cvslog] r36697 - trunk/sub/font_load_ft.c

[ib]

Author: ib
Date: Wed Jan 22 20:22:08 2014
New Revision: 36697

Log:
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.

Modified:
   trunk/sub/font_load_ft.c

Modified: trunk/sub/font_load_ft.c
==============================================================================
--- trunk/sub/font_load_ft.c	Wed Jan 22 20:11:03 2014	(r36696)
+++ trunk/sub/font_load_ft.c	Wed Jan 22 20:22:08 2014	(r36697)
@@ -1004,15 +1004,10 @@ font_desc_t* read_font_desc_ft(const cha
     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);