Mercurial > mplayer.hg

comparison mencoder.c @ 17869:9e1b5526b0da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
The system-wide and the user-specific MEncoder configuration file should both be called 'mencoder.conf', not two different names over which code and documentation disagree.
author diego
date Tue, 14 Mar 2006 23:33:37 +0000
parents e735c3f740ba
children 155fa4f8b32a
comparison
equal deleted inserted replaced
17868:03f12c4dac0d 17869:9e1b5526b0da
298 } 298 }
299 299
300 void parse_cfgfiles( m_config_t* conf ) 300 void parse_cfgfiles( m_config_t* conf )
301 { 301 {
302 char *conffile; 302 char *conffile;
303 if ((conffile = get_path("mencoder")) == NULL) { 303 if ((conffile = get_path("mencoder.conf")) == NULL) {
304 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem); 304 mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem);
305 } else { 305 } else {
306 if (m_config_parse_config_file(conf, conffile) < 0) 306 if (m_config_parse_config_file(conf, conffile) < 0)
307 mencoder_exit(1,MSGTR_ConfigfileError); 307 mencoder_exit(1,MSGTR_ConfigfileError);
308 free(conffile); 308 free(conffile);