mirror of https://github.com/mpv-player/mpv
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
This commit is contained in:
parent
9505de0250
commit
0cce2a7b35
|
@ -559,10 +559,10 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){
|
||||||
if(!parse_codec_cfg(CONFDIR"/codecs.conf")){
|
if(!parse_codec_cfg(CONFDIR"/codecs.conf")){
|
||||||
mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
|
mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
|
||||||
// printf("Exit.\n");
|
// printf("Exit.\n");
|
||||||
// exit(0); // From unknown reason a hangup occurs here :((((((
|
exit(0); // From unknown reason a hangup occurs here :((((((
|
||||||
kill(getpid(),SIGTERM);
|
// kill(getpid(),SIGTERM);
|
||||||
usleep(20000);
|
// usleep(20000);
|
||||||
kill(getpid(),SIGKILL);
|
// kill(getpid(),SIGKILL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1330,6 +1330,7 @@ if(!use_stdin && !slave_mode){
|
||||||
InitTimer();
|
InitTimer();
|
||||||
|
|
||||||
total_time_usage_start=GetTimer();
|
total_time_usage_start=GetTimer();
|
||||||
|
audio_time_usage=0; video_time_usage=0; vout_time_usage=0;
|
||||||
|
|
||||||
while(!eof){
|
while(!eof){
|
||||||
// unsigned int aq_total_time=GetTimer();
|
// unsigned int aq_total_time=GetTimer();
|
||||||
|
|
Loading…
Reference in New Issue