# HG changeset patch # User albeu # Date 1208171152 0 # Node ID cc7c52fa5eb1e516af3126442ed2a4eb8322b20b # Parent a7031923e4dc9ad33db365e4b52cde2701c4dca3 Add support for system wide config file in mencoder. Patch by Andrew Savchenko (Bircoph -at- list -dot- ru). diff -r a7031923e4dc -r cc7c52fa5eb1 mencoder.c --- a/mencoder.c Sun Apr 13 23:04:07 2008 +0000 +++ b/mencoder.c Mon Apr 14 11:05:52 2008 +0000 @@ -311,6 +311,9 @@ static void parse_cfgfiles( m_config_t* conf ) { char *conffile; + if (m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mencoder.conf") < 0) + mencoder_exit(1,MSGTR_ConfigFileError); + if ((conffile = get_path("mencoder.conf")) == NULL) { mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem); } else {