summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-02-09 21:38:28 +0100
committerwm4 <wm4@nowhere>2016-02-09 21:38:28 +0100
commit668ba7441aed3157474e03cbb1ff24430919fa85 (patch)
tree50e0955efc17a90d78f4f3f065e6c06880c0a4a8 /video
parent3d09bd77dd7c66737a3702b01f63c243d9c97aad (diff)
downloadmpv-668ba7441aed3157474e03cbb1ff24430919fa85.tar.bz2
mpv-668ba7441aed3157474e03cbb1ff24430919fa85.tar.xz
vo_opengl_cb: do also not block when drawing nothing
The ctx->redrawing field signals whether flip_page() should block. Do not block if a black frame (i.e. nothing) is to be rendered. Also, frame==NULL can never happen.
Diffstat (limited to 'video')
-rw-r--r--video/out/vo_opengl_cb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/vo_opengl_cb.c b/video/out/vo_opengl_cb.c
index 5b8bf72b99..6c425e390d 100644
--- a/video/out/vo_opengl_cb.c
+++ b/video/out/vo_opengl_cb.c
@@ -355,7 +355,7 @@ static void draw_frame(struct vo *vo, struct vo_frame *frame)
assert(!p->ctx->next_frame);
p->ctx->next_frame = vo_frame_ref(frame);
p->ctx->expected_flip_count = p->ctx->flip_count + 1;
- p->ctx->redrawing = frame ? frame->redraw : false;
+ p->ctx->redrawing = frame->redraw || !frame->current;
update(p);
pthread_mutex_unlock(&p->ctx->lock);
}