summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-05-28 21:28:40 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-05-28 21:28:40 +0000
commitc1bd86b4cdeb863282fe5ae1399d8d1ea68c9496 (patch)
tree1b3e50ceeea828eb9aab8f48621a108ad19c4dfa /mplayer.c
parent52cbc5b72f7979410ff95e1cc608fb9dc5cda462 (diff)
downloadmpv-c1bd86b4cdeb863282fe5ae1399d8d1ea68c9496.tar.bz2
mpv-c1bd86b4cdeb863282fe5ae1399d8d1ea68c9496.tar.xz
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). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15585 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/mplayer.c b/mplayer.c
index cbaf8b2e11..56d32cf63f 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2318,6 +2318,11 @@ if(!sh_video) {
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){