Mercurial > mplayer.hg

diff cfg-common.h @ 36729:19e0fc815a0e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 dba1b5aa72c1
children 3721d8f98dfe
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},