diff options
| author | wm4 <wm4@nowhere> | 2015-01-23 22:06:12 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-01-23 22:08:20 +0100 |
| commit | 5e9f7916674c4640707727eac80c659290492bad (patch) | |
| tree | 5a87d5893508384dcfaa11a35690b94b89d16e86 /video/filter | |
| parent | 4a1a0e98d8f7ce8e1ab61ff740699cce9bb43f70 (diff) | |
| download | mpv-5e9f7916674c4640707727eac80c659290492bad.tar.bz2 mpv-5e9f7916674c4640707727eac80c659290492bad.tar.xz | |
video: separate screenshot modes
Use different VOCTRLs for "window" and normal screenshot modes. The
normal one will probably be removed, and replaced by generic code in
vo.c, and this commit is preparation for this. (Doing it the other way
around would be slightly simpler, but I haven't decided yet about the
second one, and touching every VO is needed anyway in order to remove
the unneeded crap. E.g. has_osd has been unused for a long time.)
Diffstat (limited to 'video/filter')
| -rw-r--r-- | video/filter/vf.h | 2 | ||||
| -rw-r--r-- | video/filter/vf_screenshot.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/video/filter/vf.h b/video/filter/vf.h index 07f38d680b..3362320eb8 100644 --- a/video/filter/vf.h +++ b/video/filter/vf.h @@ -144,7 +144,7 @@ enum vf_ctrl { VFCTRL_SEEK_RESET = 1, // reset on picture and PTS discontinuities VFCTRL_SET_EQUALIZER, // set color options (brightness,contrast etc) VFCTRL_GET_EQUALIZER, // get color options (brightness,contrast etc) - VFCTRL_SCREENSHOT, // Take screenshot, arg is voctrl_screenshot_args + VFCTRL_SCREENSHOT, // Take screenshot, arg is mp_image** VFCTRL_INIT_OSD, // Filter OSD renderer present? VFCTRL_SET_DEINTERLACE, // Set deinterlacing status VFCTRL_GET_DEINTERLACE, // Get deinterlacing status diff --git a/video/filter/vf_screenshot.c b/video/filter/vf_screenshot.c index d60271acc4..562a1d03f5 100644 --- a/video/filter/vf_screenshot.c +++ b/video/filter/vf_screenshot.c @@ -46,8 +46,7 @@ static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi) static int control (vf_instance_t *vf, int request, void *data) { if (request == VFCTRL_SCREENSHOT && vf->priv->current) { - struct voctrl_screenshot_args *args = data; - args->out_image = mp_image_new_ref(vf->priv->current); + *(struct mp_image **)data = mp_image_new_ref(vf->priv->current); return CONTROL_TRUE; } return CONTROL_UNKNOWN; |