Mercurial > mplayer.hg

changeset 36407:4a2171d83c8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
font_load_ft: small simplifications.
author reimar
date Sat, 09 Nov 2013 08:46:01 +0000
parents c918845d0d9a
children b9cc6e7cd0a8
files sub/font_load_ft.c
diffstat 1 files changed, 2 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/sub/font_load_ft.c	Fri Nov 08 21:06:40 2013 +0000
+++ b/sub/font_load_ft.c	Sat Nov 09 08:46:01 2013 +0000
@@ -840,9 +840,7 @@
 
 static font_desc_t* init_font_desc(void)
 {
-    font_desc_t *desc;
-
-    desc = calloc(1, sizeof(*desc));
+    font_desc_t *desc = calloc(1, sizeof(*desc));
     if(!desc) return NULL;
 
     desc->dynamic = 1;
@@ -990,12 +988,7 @@
     if (subtitle_font_ppem > 128) subtitle_font_ppem = 128;
     if (osd_font_ppem > 128) osd_font_ppem = 128;
 
-    if ((subtitle_font_encoding == NULL)
-	|| (strcasecmp(subtitle_font_encoding, "unicode") == 0)) {
-	unicode = 1;
-    } else {
-	unicode = 0;
-    }
+    unicode = !subtitle_font_encoding || strcasecmp(subtitle_font_encoding, "unicode") == 0;
 
     desc = init_font_desc();
     if(!desc) goto err_out;