Mercurial > mplayer.hg

diff mencoder.c @ 26416:9d53b15aed02
Add options to disable some or all config files. Patch by Andrew Savchenko (Bircoph -at- list -dot- ru).
author: albeu
date: Mon, 14 Apr 2008 11:21:29 +0000
parents: cc7c52fa5eb1
children: c55423b185fa
--- a/mencoder.c	Mon Apr 14 11:05:52 2008 +0000
+++ b/mencoder.c	Mon Apr 14 11:21:29 2008 +0000
@@ -311,9 +311,11 @@
 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 @@
       mencoder_exit(1,MSGTR_ConfigFileError);
     free(conffile);
   }
+  }
 }