From d511ef79a09fa9e42479e66f4837daaa68b7255b Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 1 Mar 2013 11:16:01 +0100 Subject: core: simplify OSD capability handling, remove VFCAP_OSD VFCAP_OSD was used to determine at runtime whether the VO supports OSD rendering. This was mostly unused. vo_direct3d had an option to disable OSD (was supposed to allow to force auto-insertion of vf_ass, but we removed that anyway). vo_opengl_old could disable OSD rendering when a very old OpenGL version was detected, and had an option to explicitly disable it as well. Remove VFCAP_OSD from everything (and some associated logic). Now the vo_driver.draw_osd callback can be set to NULL to indicate missing OSD support (important so that vo_null etc. don't single-step on OSD redraw), and if OSD support depends on runtime support, the VO's draw_osd should just do nothing if OSD is not available. Also, do not access vo->want_redraw directly. Change the want_redraw reset logic for this purpose, too. (Probably unneeded, vo_flip_page resets it already.) --- video/out/vo_lavc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'video/out/vo_lavc.c') diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c index 2a07a67b0b..f9534b02e7 100644 --- a/video/out/vo_lavc.c +++ b/video/out/vo_lavc.c @@ -187,10 +187,8 @@ static int query_format(struct vo *vo, uint32_t format) return VFCAP_CSP_SUPPORTED | // we can do it - VFCAP_CSP_SUPPORTED_BY_HW | + VFCAP_CSP_SUPPORTED_BY_HW; // we don't convert colorspaces here - VFCAP_OSD; - // we have OSD } static void write_packet(struct vo *vo, int size, AVPacket *packet) -- cgit v1.2.3