diff options
| author | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-14 11:05:52 +0000 |
|---|---|---|
| committer | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-14 11:05:52 +0000 |
| commit | c439e8b46859edc563e3a7177c7b957acaeb7315 (patch) | |
| tree | 16859fff58b3227d3d3c20fe6cc45b1cbb6fb531 /mencoder.c | |
| parent | c9e6af5949b89600742254b837fd419e26ed2a98 (diff) | |
| download | mpv-c439e8b46859edc563e3a7177c7b957acaeb7315.tar.bz2 mpv-c439e8b46859edc563e3a7177c7b957acaeb7315.tar.xz | |
Add support for system wide config file in mencoder.
Patch by Andrew Savchenko (Bircoph -at- list -dot- ru).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26447 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mencoder.c b/mencoder.c index 1274244a54..69760c8642 100644 --- a/mencoder.c +++ b/mencoder.c @@ -311,6 +311,9 @@ static void mencoder_exit(int level, const char *how) 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 { |