summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-03-12 23:41:25 +0100
committerwm4 <wm4@nowhere>2015-03-12 23:41:25 +0100
commit9a7fc55607438b60f25c52b0a16341056a99f882 (patch)
tree51dad069366d9d903fed4876d2aa1a83ada394a4 /video
parent209f8225eda88f5b3a56ac37e459e4e9bda01d7e (diff)
downloadmpv-9a7fc55607438b60f25c52b0a16341056a99f882.tar.bz2
mpv-9a7fc55607438b60f25c52b0a16341056a99f882.tar.xz
command: display-fps is the display FPS as assumed by the VO
Requested change in behavior. Note that we set the assumed "infinite" display_fps to 1e6, which conveniently lets vo_get_vsync_interval() return a dummy value of 1, which can be easily checked against, and still avoids doing math with float INFs.
Diffstat (limited to 'video')
-rw-r--r--video/out/vo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/vo.c b/video/out/vo.c
index 55ff0b7702..fe53102577 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -312,7 +312,7 @@ static void update_display_fps(struct vo *vo)
pthread_mutex_unlock(&in->lock);
- double display_fps = 1000.0; // assume infinite if unset
+ double display_fps = 1e6; // assume infinite if unset
if (vo->global->opts->frame_drop_fps > 0) {
display_fps = vo->global->opts->frame_drop_fps;
} else {