diff options
| author | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-15 13:20:15 +0000 |
|---|---|---|
| committer | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-15 13:20:15 +0000 |
| commit | a2728034c9b0609e06dcf205531993b34fc431fe (patch) | |
| tree | f2ff19e74e643f27bb22329c5ea5afe8cc9da1bd | |
| parent | c206a31228477a538a07bfc10574a75044a89cdf (diff) | |
| download | mpv-a2728034c9b0609e06dcf205531993b34fc431fe.tar.bz2 mpv-a2728034c9b0609e06dcf205531993b34fc431fe.tar.xz | |
noconfig fix, disable_gui_conf was not defined when compiling mencoder.
Fix mencoder linking when the GUI is enabled.
Patch by Norman Yarvin (yarvin -at- yarchive -dot- net).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26454 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | gui/cfg.c | 2 | ||||
| -rw-r--r-- | mpcommon.c | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -83,7 +83,7 @@ gtkASS_t gtkASS; extern int stop_xscreensaver; extern int m_config_parse_config_file(m_config_t* config, char *conffile); -int disable_gui_conf=0; +extern int disable_gui_conf; static m_config_t * gui_conf; static const m_option_t gui_opts[] = diff --git a/mpcommon.c b/mpcommon.c index d603623964..d1d7316230 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -210,7 +210,9 @@ 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; -extern int disable_gui_conf; +#ifdef HAVE_NEW_GUI +int disable_gui_conf=0; +#endif /* HAVE_NEW_GUI */ /* Disable all configuration files */ static void noconfig_all(void) |