From 191bcbd1f2a0aa7ab64ed0e2768f29fedf2f4c30 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 4 Nov 2012 15:56:04 +0100 Subject: 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. --- video/out/vo_lavc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'video/out/vo_lavc.c') diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c index 9f72e9f1d9..d01781ee9e 100644 --- a/video/out/vo_lavc.c +++ b/video/out/vo_lavc.c @@ -514,9 +514,6 @@ static int control(struct vo *vo, uint32_t request, void *data) switch (request) { case VOCTRL_QUERY_FORMAT: return query_format(vo, *((uint32_t *)data)); - case VOCTRL_DRAW_IMAGE: - draw_image(vo, (mp_image_t *)data, vo->next_pts); - return 0; case VOCTRL_SET_YUV_COLORSPACE: vc->colorspace = *(struct mp_csp_details *)data; if (vc->stream) { @@ -534,7 +531,6 @@ static int control(struct vo *vo, uint32_t request, void *data) } const struct vo_driver video_out_lavc = { - .is_new = true, .buffer_frames = false, .info = &(const struct vo_info_s){ "video encoding using libavcodec", @@ -547,6 +543,7 @@ const struct vo_driver video_out_lavc = { .control = control, .uninit = uninit, .check_events = check_events, + .draw_image_pts = draw_image, .draw_osd = draw_osd, .flip_page_timed = flip_page_timed, }; -- cgit v1.2.3