Mercurial > mplayer.hg
changeset 36729:19e0fc815a0e
Fix compilation without freetype.
subtitle_font_encoding is now also used when
freetype is disabled.
| author | reimar |
|---|---|
| date | Wed, 12 Feb 2014 19:16:31 +0000 |
| parents | 56cfc2c9cbad |
| children | 8bc4d669c5d7 |
| files | cfg-common.h sub/font_load_ft.c sub/sub.c |
| diffstat | 3 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-common.h Sun Feb 09 22:19:09 2014 +0000 +++ b/cfg-common.h Wed Feb 12 19:16:31 2014 +0000 @@ -604,8 +604,8 @@ {"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}, + {"subfont-encoding", &subtitle_font_encoding, CONF_TYPE_STRING, 0, 0, 0, NULL}, #ifdef CONFIG_FREETYPE - {"subfont-encoding", &subtitle_font_encoding, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"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},
--- a/sub/font_load_ft.c Sun Feb 09 22:19:09 2014 +0000 +++ b/sub/font_load_ft.c Wed Feb 12 19:16:31 2014 +0000 @@ -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;
--- a/sub/sub.c Sun Feb 09 22:19:09 2014 +0000 +++ b/sub/sub.c Wed Feb 12 19:16:31 2014 +0000 @@ -84,6 +84,7 @@ //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;