[MPlayer-cvslog] r26447 - trunk/mencoder.c

[albeu]

Author: albeu
Date: Mon Apr 14 13:05:52 2008
New Revision: 26447

Log:
Add support for system wide config file in mencoder.
Patch by Andrew Savchenko (Bircoph -at- list -dot- ru).


Modified:
   trunk/mencoder.c

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	(original)
+++ trunk/mencoder.c	Mon Apr 14 13:05:52 2008
@@ -311,6 +311,9 @@ static void mencoder_exit(int level, con
 static void parse_cfgfiles( m_config_t* conf )
 {
   char *conffile;
+  if (m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mencoder.conf") < 0)
+    mencoder_exit(1,MSGTR_ConfigFileError); 
+
   if ((conffile = get_path("mencoder.conf")) == NULL) {
     mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem);
   } else {