[MPlayer-cvslog] r36825 - in trunk: cfg-common.h sub/font_load_ft.c sub/sub.c

[reimar]

Author: reimar
Date: Wed Feb 12 20:16:31 2014
New Revision: 36825

Log:
Fix compilation without freetype.

subtitle_font_encoding is now also used when
freetype is disabled.

Modified:
   trunk/cfg-common.h
   trunk/sub/font_load_ft.c
   trunk/sub/sub.c

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Sun Feb  9 23:19:09 2014	(r36824)
+++ trunk/cfg-common.h	Wed Feb 12 20:16:31 2014	(r36825)
@@ -604,8 +604,8 @@ const m_option_t common_opts[] = {
     {"spualign", &spu_alignment, CONF_TYPE_INT, CONF_RANGE, -1, 2, NULL},
     {"spuaa", &spu_aamode, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},
     {"spugauss", &spu_gaussvar, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 3.0, NULL},
-#ifdef CONFIG_FREETYPE
     {"subfont-encoding", &subtitle_font_encoding, CONF_TYPE_STRING, 0, 0, 0, NULL},
+#ifdef CONFIG_FREETYPE
     {"subfont-text-scale", &text_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0, 100, NULL},
     {"subfont-osd-scale", &osd_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0, 100, NULL},
     {"subfont-blur", &subtitle_font_radius, CONF_TYPE_FLOAT, CONF_RANGE, 0, 8, NULL},

Modified: trunk/sub/font_load_ft.c
==============================================================================
--- trunk/sub/font_load_ft.c	Sun Feb  9 23:19:09 2014	(r36824)
+++ trunk/sub/font_load_ft.c	Wed Feb 12 20:16:31 2014	(r36825)
@@ -56,7 +56,6 @@
 #define HAVE_FREETYPE21
 #endif
 
-char *subtitle_font_encoding = NULL;
 float text_font_scale_factor = 3.5;
 float osd_font_scale_factor = 4.0;
 float subtitle_font_radius = 2.0;

Modified: trunk/sub/sub.c
==============================================================================
--- trunk/sub/sub.c	Sun Feb  9 23:19:09 2014	(r36824)
+++ trunk/sub/sub.c	Wed Feb 12 20:16:31 2014	(r36825)
@@ -84,6 +84,7 @@ char * sub_osd_names_short[] ={ "", "|>"
 //static int vo_font_loaded=-1;
 font_desc_t* vo_font=NULL;
 font_desc_t* sub_font=NULL;
+char *subtitle_font_encoding = NULL;
 
 unsigned char* vo_osd_text=NULL;
 void* vo_osd_teletext_page=NULL;