summaryrefslogtreecommitdiffstats
path: root/cfg-common.h
diff options
context:
space:
mode:
authoruau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-22 19:21:16 +0000
committeruau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-22 19:21:16 +0000
commit544233bded74186eca2498e202ed82003c5e04be (patch)
treef6360316ae6a9a2b01bac7ff6494ee94bd655cf2 /cfg-common.h
parent6982f81d903afe3838cd743d5f0b50e10be2f2cc (diff)
downloadmpv-544233bded74186eca2498e202ed82003c5e04be.tar.bz2
mpv-544233bded74186eca2498e202ed82003c5e04be.tar.xz
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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21177 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-common.h')
-rw-r--r--cfg-common.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/cfg-common.h b/cfg-common.h
index 7096ffa9b2..23740294a6 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -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