From 435d7c97c900a53adedcca32b07bb4a9a5f890d3 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Tue, 21 Aug 2012 18:52:31 +0300 Subject: cleanup: remove pointless #defines Remove the following #defines, which should never change in practice: CONFIG_FAKE_MONO, OUTBURST, FAST_OSD, FAST_OSD_TABLE The configure script hardcoded these to particular values in config.h. They could only be changed by manually editing it. I don't think anyone would want to. X11_FULLSCREEN This once did something, but became meaningless years ago and was now always set to true if the files using it were compiled at all. Conflicts: configure libvo/osd.c libvo/vo_gl.c Merged from mplayer2. The OSD defines were already removed in this fork. --- cfg-mplayer.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'cfg-mplayer.h') diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 4e2756b298..4acdf96657 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -470,9 +470,7 @@ const m_option_t common_opts[] = { // ------------------------- codec/vfilter options -------------------- // MP3-only: select stereo/left/right -#ifdef CONFIG_FAKE_MONO {"stereo", &fakemono, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL}, -#endif {"af*", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, {"af-adv", (void *) audio_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, -- cgit v1.2.3