[MPlayer-cvslog] CVS: main mplayer.c,1.845,1.846

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv8239

Modified Files:
	mplayer.c 
Log Message:
keep vo_fps and vo_mouse_timer_const in sync with sh_video->fps, otherwise
mouse pointer autohide and the volume OSD from the gui break (with e.g. asf).


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.845
retrieving revision 1.846
diff -u -r1.845 -r1.846
--- mplayer.c	18 May 2005 11:38:05 -0000	1.845
+++ mplayer.c	28 May 2005 21:28:40 -0000	1.846
@@ -2318,6 +2318,11 @@
 	sh_video->timer+=frame_time;
 	if(sh_audio) sh_audio->delay-=frame_time;
 	time_frame+=frame_time;  // for nosound
+	// video_read_frame can change fps (e.g. for asf video)
+	vo_fps = sh_video->fps;
+#ifdef HAVE_X11
+	vo_mouse_timer_const = (int)sh_video->fps;
+#endif
 	// check for frame-drop:
 	current_module="check_framedrop";
 	if(sh_audio && !d_audio->eof){