summaryrefslogtreecommitdiffstats
path: root/mpcommon.c
diff options
context:
space:
mode:
authoralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-15 13:20:15 +0000
committeralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-15 13:20:15 +0000
commita2728034c9b0609e06dcf205531993b34fc431fe (patch)
treef2ff19e74e643f27bb22329c5ea5afe8cc9da1bd /mpcommon.c
parentc206a31228477a538a07bfc10574a75044a89cdf (diff)
downloadmpv-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
Diffstat (limited to 'mpcommon.c')
-rw-r--r--mpcommon.c4
1 files changed, 3 insertions, 1 deletions
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)