summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-11-01 14:19:22 +0100
committerwm4 <wm4@nowhere>2015-11-01 14:19:22 +0100
commit85818351610b6b3fa72ab46bbb17875876d99fe9 (patch)
treef8fe1d08771d27f85b3137e25401f89a057bc167
parentcdeb0e4c72cd9c0ebed233bcee80d19250d57550 (diff)
downloadmpv-85818351610b6b3fa72ab46bbb17875876d99fe9.tar.bz2
mpv-85818351610b6b3fa72ab46bbb17875876d99fe9.tar.xz
vo: fix no-audio mode with interpolation enabled/display-sync disabled
Commit acd5816a broke this. It was stopping playback occasionally. Another case where the non-display-sync interpolation mode (in->vsync_timed==true) is causing a lot of subtle issues and will be removed soon.
-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 5bc34c0f1b..1ab0b91ef6 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -618,7 +618,7 @@ static bool render_frame(struct vo *vo)
in->current_frame = in->frame_queued;
in->frame_queued = NULL;
} else if (in->paused || !in->current_frame || !in->hasframe ||
- in->current_frame->num_vsyncs < 1 ||
+ (!in->vsync_timed && in->current_frame->num_vsyncs < 1) ||
(!in->vsync_timed && !in->current_frame->display_synced))
{
goto done;