Mercurial > mplayer.hg

changeset 36601:63661fc7b53b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author ib
date Wed, 22 Jan 2014 19:22:08 +0000
parents 595879066f26
children 5964549c821f
files sub/font_load_ft.c
diffstat 1 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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);