Mercurial > mplayer.hg

diff cfg-common.h @ 21161:ad7747bce52d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make compilation depending on USE_OSD unconditional. USE_OSD was hardcoded to true in configure, manually turning it off would break compilation, and most OSD-related code wasn't affected by it anyway so it did nothing useful.
author uau
date Wed, 22 Nov 2006 19:21:16 +0000
parents b42f1c1ef651
children 597505748535
line wrap: on
line diff
--- a/cfg-common.h	Wed Nov 22 19:19:47 2006 +0000
+++ b/cfg-common.h	Wed Nov 22 19:21:16 2006 +0000
@@ -288,7 +288,6 @@
 	{"sub-bg-alpha", &sub_bg_alpha, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL},
 	{"sub-no-text-pp", &sub_no_text_pp, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"sub-fuzziness", &sub_match_fuzziness, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
-#ifdef USE_OSD
 	{"font", &font_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"ffactor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0, NULL},
  	{"subpos", &sub_pos, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
@@ -328,7 +327,6 @@
 	{"fontconfig", "MPlayer was compiled without fontconfig support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 	{"nofontconfig", "MPlayer was compiled without fontconfig support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
-#endif
 
 #else