[MPlayer-cvslog] CVS: main mencoder.c,1.342,1.343

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv8495

Modified Files:
	mencoder.c 
Log Message:
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.


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- mencoder.c	24 Feb 2006 15:43:20 -0000	1.342
+++ mencoder.c	14 Mar 2006 23:33:35 -0000	1.343
@@ -300,7 +300,7 @@
 void parse_cfgfiles( m_config_t* conf )
 {
   char *conffile;
-  if ((conffile = get_path("mencoder")) == NULL) {
+  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)