summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-05-22 09:28:17 +0200
committerwm4 <wm4@nowhere>2014-05-22 09:28:17 +0200
commit85c3459bf8878d522bf96e15f4ef0d87f1f51fd0 (patch)
tree48297654c42d7b65d084d76dfc678684a94ba69e
parent38c8f5ea575233ade4d77ebbf10ee618271fbbaf (diff)
downloadmpv-85c3459bf8878d522bf96e15f4ef0d87f1f51fd0.tar.bz2
mpv-85c3459bf8878d522bf96e15f4ef0d87f1f51fd0.tar.xz
vo_vaapi: don't redraw twice
After VOCTRL_REDRAW_FRAME, flip_page is called, which renders the frame. The current code rendered the frame twice; drop the redundant call.
-rw-r--r--video/out/vo_vaapi.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/video/out/vo_vaapi.c b/video/out/vo_vaapi.c
index ac8fb54540..470d767b60 100644
--- a/video/out/vo_vaapi.c
+++ b/video/out/vo_vaapi.c
@@ -299,12 +299,6 @@ static struct mp_image *get_screenshot(struct priv *p)
return img;
}
-static bool redraw_frame(struct priv *p)
-{
- p->output_surface = p->visible_surface;
- return render_to_screen(p, p->output_surfaces[p->output_surface]);
-}
-
static void free_subpicture(struct priv *p, struct vaapi_osd_image *img)
{
if (img->image.image_id != VA_INVALID_ID)
@@ -528,7 +522,7 @@ static int control(struct vo *vo, uint32_t request, void *data)
return get_equalizer(p, eq->name, eq->valueptr);
}
case VOCTRL_REDRAW_FRAME:
- redraw_frame(p);
+ p->output_surface = p->visible_surface;
return true;
case VOCTRL_SCREENSHOT: {
struct voctrl_screenshot_args *args = data;