[Mplayer-cvslog] CVS: main mplayer.c,1.351,1.352 mencoder.c,1.51,1.52

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv21518

Modified Files:
	mplayer.c mencoder.c 
Log Message:
search codecs.conf at CONFDIR

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- mplayer.c	25 Dec 2001 20:32:01 -0000	1.351
+++ mplayer.c	25 Dec 2001 21:59:07 -0000	1.352
@@ -553,7 +553,7 @@
 
 // check codec.conf
 if(!parse_codec_cfg(get_path("codecs.conf"))){
-  if(!parse_codec_cfg(DATADIR"/codecs.conf")){
+  if(!parse_codec_cfg(CONFDIR"/codecs.conf")){
     mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
 //    printf("Exit.\n");
 //    exit(0);  // From unknown reason a hangup occurs here :((((((

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- mencoder.c	24 Dec 2001 14:01:55 -0000	1.51
+++ mencoder.c	25 Dec 2001 21:59:07 -0000	1.52
@@ -338,7 +338,7 @@
 
 // check codec.conf
 if(!parse_codec_cfg(get_path("codecs.conf"))){
-  if(!parse_codec_cfg(DATADIR"/codecs.conf")){
+  if(!parse_codec_cfg(CONFDIR"/codecs.conf")){
     mp_msg(MSGT_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf);
     exit(0);
   }