codecs.conf parser hangup fixed by iive, cpu usage reset at start

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3935 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 5 insertions, 4 deletions

diff --git a/mplayer.c b/mplayer.c
index 77b85050a4..f674419b2e 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -559,10 +559,10 @@ if(!parse_codec_cfg(get_path("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 :((((((
-    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 @@ if(!use_stdin && !slave_mode){
 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();