# HG changeset patch
# User arpi_esp
# Date 987268790 0
# Node ID b353ad229e3fabbb6adfddf9b18c8c367a4bc1bc
# Parent  0234b20ae1473d96fe2e144dcc35c9414ca77aba
-fps is working again for all file formats

diff -r 0234b20ae147 -r b353ad229e3f mplayer.c
--- a/mplayer.c	Sat Apr 14 17:08:31 2001 +0000
+++ b/mplayer.c	Sat Apr 14 17:19:50 2001 +0000
@@ -1367,7 +1367,7 @@
         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 @@
     // 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;