diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
commit | 6cce822505c0a76ac520909a895021b8f5b7e5ab (patch) | |
tree | f8ba954c698470208a243be3da216f7f54367f46 /mpcommon.c | |
parent | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (diff) | |
parent | ded7033671fb7d84fbdb67ace46c1fc8833631bc (diff) | |
download | mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.bz2 mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.xz |
Merge svn changes up to r27399
Conflicts:
libmpcodecs/vd.c
libmpcodecs/ve_raw.c
libvo/video_out.c
libvo/x11_common.c
mplayer.c
Diffstat (limited to 'mpcommon.c')
-rw-r--r-- | mpcommon.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mpcommon.c b/mpcommon.c index c577dce4fd..980da30d4e 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -212,26 +212,26 @@ int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang) /* Parse -noconfig common to both programs */ int disable_system_conf=0; int disable_user_conf=0; -#ifdef HAVE_NEW_GUI +#ifdef CONFIG_GUI int disable_gui_conf=0; -#endif /* HAVE_NEW_GUI */ +#endif /* CONFIG_GUI */ /* Disable all configuration files */ static void noconfig_all(void) { disable_system_conf = 1; disable_user_conf = 1; -#ifdef HAVE_NEW_GUI +#ifdef CONFIG_GUI disable_gui_conf = 1; -#endif /* HAVE_NEW_GUI */ +#endif /* CONFIG_GUI */ } const m_option_t noconfig_opts[] = { {"all", noconfig_all, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 0, NULL}, {"system", &disable_system_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL}, {"user", &disable_user_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL}, -#ifdef HAVE_NEW_GUI +#ifdef CONFIG_GUI {"gui", &disable_gui_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL}, -#endif /* HAVE_NEW_GUI */ +#endif /* CONFIG_GUI */ {NULL, NULL, 0, 0, 0, 0, NULL} }; |