diff options
author | wm4 <wm4@nowhere> | 2015-01-24 22:56:02 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-01-24 23:16:27 +0100 |
commit | 28582322207bb962553505f0c25268f4b786287d (patch) | |
tree | 8c9611a9161f48338701fc506646aaedd8c1a491 /video/out/vo_x11.c | |
parent | 047788e3b1354562f99ce8dacdba1972ad990d03 (diff) | |
download | mpv-28582322207bb962553505f0c25268f4b786287d.tar.bz2 mpv-28582322207bb962553505f0c25268f4b786287d.tar.xz |
vo: simplify VOs by adding generic screenshot support
At the time screenshot support was added, images weren't refcounted yet,
so screenshots required specialized implementations in the VOs. But now
we can handle these things much simpler. Also see commit 5bb24980.
If there are VOs in the future which can't do this (e.g. they need to
write to the image passed to vo_driver->draw_image), this still could be
disabled on a per-VO basis etc., so we lose no potential performance
advantages.
Diffstat (limited to 'video/out/vo_x11.c')
-rw-r--r-- | video/out/vo_x11.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c index 32d9b731fd..aa578d4883 100644 --- a/video/out/vo_x11.c +++ b/video/out/vo_x11.c @@ -423,16 +423,6 @@ static struct mp_image get_x_buffer(struct priv *p, int buf_index) return img; } -static mp_image_t *get_screenshot(struct vo *vo) -{ - struct priv *p = vo->priv; - - if (!p->original_image) - return NULL; - - return mp_image_new_ref(p->original_image); -} - static void wait_for_completion(struct vo *vo, int max_outstanding) { #if HAVE_SHM && HAVE_XEXT @@ -619,9 +609,6 @@ static int control(struct vo *vo, uint32_t request, void *data) case VOCTRL_REDRAW_FRAME: draw_image(vo, p->original_image); return true; - case VOCTRL_SCREENSHOT: - *(struct mp_image **)data = get_screenshot(vo); - return true; } int events = 0; |