diff options
| author | wm4 <wm4@nowhere> | 2012-11-04 15:56:04 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-01-13 17:39:31 +0100 |
| commit | 191bcbd1f2a0aa7ab64ed0e2768f29fedf2f4c30 (patch) | |
| tree | 5051c40e3342b47369953605ea0a7edf3d1599eb /video/out/vo_vdpau.c | |
| parent | 97032f1b58cc4c5c17002939703ee16904691675 (diff) | |
| download | mpv-191bcbd1f2a0aa7ab64ed0e2768f29fedf2f4c30.tar.bz2 mpv-191bcbd1f2a0aa7ab64ed0e2768f29fedf2f4c30.tar.xz | |
video/out: make draw_image mandatory, remove VOCTRL_DRAW_IMAGE
Remove VOCTRL_DRAW_IMAGE and always set vo_driver.draw_image in VOs.
Make draw_image mandatory: change some VOs (like vo_x11) to support it,
and remove the image-to-slices fallback in vf_vo.
Remove vo_driver.is_new. This member indicated whether draw_image is
supported unconditionally, which is now always the case.
draw_image_pts is a hack until the video filter chain is changed to
include the PTS as field in mp_image. Then vo_vdpau and vo_lavc will
be changed to use draw_image.
Diffstat (limited to 'video/out/vo_vdpau.c')
| -rw-r--r-- | video/out/vo_vdpau.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c index da6a4cca09..d98fa17a72 100644 --- a/video/out/vo_vdpau.c +++ b/video/out/vo_vdpau.c @@ -1608,8 +1608,6 @@ static int control(struct vo *vo, uint32_t request, void *data) return query_format(*(uint32_t *)data); case VOCTRL_GET_IMAGE: return get_image(vo, data); - case VOCTRL_DRAW_IMAGE: - abort(); // draw_image() should get called directly case VOCTRL_BORDER: vo_x11_border(vo); checked_resize(vo); @@ -1680,7 +1678,6 @@ static int control(struct vo *vo, uint32_t request, void *data) #define OPT_BASE_STRUCT struct vdpctx const struct vo_driver video_out_vdpau = { - .is_new = true, .buffer_frames = true, .info = &(const struct vo_info_s){ "VDPAU with X11", @@ -1691,7 +1688,7 @@ const struct vo_driver video_out_vdpau = { .preinit = preinit, .config = config, .control = control, - .draw_image = draw_image, + .draw_image_pts = draw_image, .get_buffered_frame = set_next_frame_info, .draw_slice = draw_slice, .draw_osd = draw_osd, |