summaryrefslogtreecommitdiffstats
path: root/video/out/vo_lavc.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-04 15:56:04 +0100
committerwm4 <wm4@nowhere>2013-01-13 17:39:31 +0100
commit191bcbd1f2a0aa7ab64ed0e2768f29fedf2f4c30 (patch)
tree5051c40e3342b47369953605ea0a7edf3d1599eb /video/out/vo_lavc.c
parent97032f1b58cc4c5c17002939703ee16904691675 (diff)
downloadmpv-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_lavc.c')
-rw-r--r--video/out/vo_lavc.c5
1 files changed, 1 insertions, 4 deletions
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,
};