summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-23 11:21:27 +0100
committerwm4 <wm4@nowhere>2015-01-23 11:21:27 +0100
commit9c45cdd55e7faa8fecd28be6e1941102d98ae56d (patch)
tree90f1674a567a23c7a614353956c353366243cd6f
parentd1886f3318773d4232895e862555c03b24636c05 (diff)
downloadmpv-9c45cdd55e7faa8fecd28be6e1941102d98ae56d.tar.bz2
mpv-9c45cdd55e7faa8fecd28be6e1941102d98ae56d.tar.xz
vo: fix framedrop in normal case
vsync_timed is true if smoothmotion is used. That would mean framedrop is always disabled in the normal case.
-rw-r--r--video/out/vo.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/video/out/vo.c b/video/out/vo.c
index 943e99d246..605d3b3555 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -578,7 +578,8 @@ static bool render_frame(struct vo *vo)
// Even if we're hopelessly behind, rather degrade to 10 FPS playback,
// instead of just freezing the display forever.
in->dropped_frame &= mp_time_us() - in->last_flip < 100 * 1000;
- in->dropped_frame &= in->vsync_timed && !!img;
+ if (in->vsync_timed)
+ in->dropped_frame &= !!img;
if (in->vsync_timed && !img && in->hasframe_rendered &&
prev_vsync > pts + in->vsync_interval_approx) {