Mercurial > mplayer.hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 26415:cc7c52fa5eb1 | 26416:9d53b15aed02 |
|---|---|
| 309 } | 309 } |
| 310 | 310 |
| 311 static void parse_cfgfiles( m_config_t* conf ) | 311 static void parse_cfgfiles( m_config_t* conf ) |
| 312 { | 312 { |
| 313 char *conffile; | 313 char *conffile; |
| 314 if (m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mencoder.conf") < 0) | 314 if (!disable_system_conf && |
| 315 m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mencoder.conf") < 0) | |
| 315 mencoder_exit(1,MSGTR_ConfigFileError); | 316 mencoder_exit(1,MSGTR_ConfigFileError); |
| 316 | 317 |
| 318 if (!disable_user_conf) { | |
| 317 if ((conffile = get_path("mencoder.conf")) == NULL) { | 319 if ((conffile = get_path("mencoder.conf")) == NULL) { |
| 318 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem); | 320 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem); |
| 319 } else { | 321 } else { |
| 320 if (m_config_parse_config_file(conf, conffile) < 0) | 322 if (m_config_parse_config_file(conf, conffile) < 0) |
| 321 mencoder_exit(1,MSGTR_ConfigFileError); | 323 mencoder_exit(1,MSGTR_ConfigFileError); |
| 322 free(conffile); | 324 free(conffile); |
| 325 } | |
| 323 } | 326 } |
| 324 } | 327 } |
| 325 | 328 |
| 326 | 329 |
| 327 //--------------------------------------------------------------------------- | 330 //--------------------------------------------------------------------------- |