Mercurial > mplayer.hg
diff cfg-common.h @ 21140:b42f1c1ef651
Make compilation depending on USE_SUB unconditional.
USE_SUB was hardcoded to true in configure, manually turning it off
would break compilation, and there's no apparent reason why having all
subtitle code under #ifdefs (even working ones) would be worth the
clutter.
author | uau |
---|---|
date | Tue, 21 Nov 2006 20:48:17 +0000 |
parents | 20110e4437c6 |
children | ad7747bce52d |
line wrap: on
line diff
--- a/cfg-common.h Tue Nov 21 20:31:35 2006 +0000 +++ b/cfg-common.h Tue Nov 21 20:48:17 2006 +0000 @@ -251,7 +251,6 @@ {"codecs-file", &codecs_file, CONF_TYPE_STRING, 0, 0, 0, NULL}, // ------------------------- subtitles options -------------------- -#ifdef USE_SUB {"sub", &sub_name, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, #ifdef USE_FRIBIDI {"fribidi-charset", &fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL}, @@ -289,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}, -#endif #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},