Mercurial > mplayer.hg

diff mencoder.c @ 34172:5761a9a31bcb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sanitize include option behaviour. If the file could not be opened/read/processed, print a message and quit instead of completely silently ignoring it.
author reimar
date Tue, 25 Oct 2011 20:45:09 +0000
parents 552f50c89163
children 70ac8d21e6ca
line wrap: on
line diff
--- a/mencoder.c	Tue Oct 25 20:42:50 2011 +0000
+++ b/mencoder.c	Tue Oct 25 20:45:09 2011 +0000
@@ -259,14 +259,14 @@
 {
   char *conffile;
   if (!disable_system_conf &&
-      m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mencoder.conf") < 0)
+      m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mencoder.conf", 1) < 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 {
-      if (m_config_parse_config_file(conf, conffile) < 0)
+      if (m_config_parse_config_file(conf, conffile, 1) < 0)
         mencoder_exit(1,MSGTR_ConfigFileError);
       free(conffile);
     }