diff options
author | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-14 17:19:50 +0000 |
---|---|---|
committer | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-14 17:19:50 +0000 |
commit | 871028a892b58b19731569ca42251904450c6aef (patch) | |
tree | e82af96ebfee336361b7efcd7dbe2e8b015ead81 | |
parent | 21479b68399ec3e8c6d13ed8a3b17f9b18b4e949 (diff) | |
download | mpv-871028a892b58b19731569ca42251904450c6aef.tar.bz2 mpv-871028a892b58b19731569ca42251904450c6aef.tar.xz |
-fps is working again for all file formats
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@407 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | mplayer.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1367,7 +1367,7 @@ switch(has_video){ t+=GetTimer(); video_time_usage+=t*0.000001; newfps=frameratecode2framerate[picture->frame_rate_code]*0.0001f; - if(ABS(sh_video->fps-newfps)>0.01f){ + if(ABS(sh_video->fps-newfps)>0.01f) if(!force_fps){ printf("Warning! FPS changed %5.3f -> %5.3f (%f) [%d] \n",sh_video->fps,newfps,sh_video->fps-newfps,picture->frame_rate_code); sh_video->fps=newfps; sh_video->frametime=10000.0f/(float)frameratecode2framerate[picture->frame_rate_code]; @@ -1384,7 +1384,7 @@ switch(has_video){ // Increase video timers: num_frames+=frame_time; frame_time*=sh_video->frametime; - if(file_format==DEMUXER_TYPE_ASF){ + if(file_format==DEMUXER_TYPE_ASF && !force_fps){ // .ASF files has no fixed FPS - just frame durations! float d=d_video->pts-pts1; if(d>=0 && d<5) frame_time=d; |