Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv5468 Modified Files: mplayer.c Log Message: -fps is working again for all file formats Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -r1.57 -r1.58 *** mplayer.c 2001/04/14 17:08:31 1.57 --- mplayer.c 2001/04/14 17:19:50 1.58 *************** *** 1368,1372 **** newfps=frameratecode2framerate[picture->frame_rate_code]*0.0001f; ! if(ABS(sh_video->fps-newfps)>0.01f){ 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; --- 1368,1372 ---- newfps=frameratecode2framerate[picture->frame_rate_code]*0.0001f; ! 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; *************** *** 1385,1389 **** num_frames+=frame_time; frame_time*=sh_video->frametime; ! if(file_format==DEMUXER_TYPE_ASF){ // .ASF files has no fixed FPS - just frame durations! float d=d_video->pts-pts1; --- 1385,1389 ---- num_frames+=frame_time; frame_time*=sh_video->frametime; ! if(file_format==DEMUXER_TYPE_ASF && !force_fps){ // .ASF files has no fixed FPS - just frame durations! float d=d_video->pts-pts1; _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog@lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog