summaryrefslogtreecommitdiffstats
path: root/mencoder.c
diff options
context:
space:
mode:
authoralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-14 11:21:29 +0000
committeralbeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-14 11:21:29 +0000
commit6e62b3a85fc2c7a74dd3242bf123cc5f26adaeb0 (patch)
treef049be7e07ecb9657bce2fb8e6945475583099ec /mencoder.c
parentc439e8b46859edc563e3a7177c7b957acaeb7315 (diff)
downloadmpv-6e62b3a85fc2c7a74dd3242bf123cc5f26adaeb0.tar.bz2
mpv-6e62b3a85fc2c7a74dd3242bf123cc5f26adaeb0.tar.xz
Add options to disable some or all config files.
Patch by Andrew Savchenko (Bircoph -at- list -dot- ru). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26448 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r--mencoder.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/mencoder.c b/mencoder.c
index 69760c8642..ae35f3d5e2 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -311,9 +311,11 @@ 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)
+ if (!disable_system_conf &&
+ m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mencoder.conf") < 0)
mencoder_exit(1,MSGTR_ConfigFileError);
+ if (!disable_user_conf) {
if ((conffile = get_path("mencoder.conf")) == NULL) {
mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem);
} else {
@@ -321,6 +323,7 @@ static void parse_cfgfiles( m_config_t* conf )
mencoder_exit(1,MSGTR_ConfigFileError);
free(conffile);
}
+ }
}