Mercurial > mplayer.hg
changeset 26415:cc7c52fa5eb1
Add support for system wide config file in mencoder.
Patch by Andrew Savchenko (Bircoph -at- list -dot- ru).
author | albeu |
---|---|
date | Mon, 14 Apr 2008 11:05:52 +0000 |
parents | a7031923e4dc |
children | 9d53b15aed02 |
files | mencoder.c |
diffstat | 1 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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 {