[Mplayer-cvslog] CVS: main mplayer.c,1.358,1.359

[Arpi of Ize]

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

Modified Files:
	mplayer.c 
Log Message:
codecs.conf parser hangup fixed by iive, cpu usage reset at start

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- mplayer.c	28 Dec 2001 19:47:37 -0000	1.358
+++ mplayer.c	1 Jan 2002 22:46:07 -0000	1.359
@@ -559,10 +559,10 @@
   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 :((((((
-    kill(getpid(),SIGTERM);
-    usleep(20000);
-    kill(getpid(),SIGKILL);
+    exit(0);  // From unknown reason a hangup occurs here :((((((
+//    kill(getpid(),SIGTERM);
+//    usleep(20000);
+//    kill(getpid(),SIGKILL);
   }
 }
 
@@ -1330,6 +1330,7 @@
 InitTimer();
 
 total_time_usage_start=GetTimer();
+audio_time_usage=0; video_time_usage=0; vout_time_usage=0;
 
 while(!eof){
 //    unsigned int aq_total_time=GetTimer();