RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
albeu 2008-04-15 13:20:15 +00:00
parent c206a31228
commit a2728034c9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/cfg.c
View File

@ -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[] =

4
mpcommon.c
View File

@ -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)