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/filter/vf_vo.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'video/filter/vf_vo.c') diff --git a/video/filter/vf_vo.c b/video/filter/vf_vo.c index d8d00130d7..922229aa53 100644 --- a/video/filter/vf_vo.c +++ b/video/filter/vf_vo.c @@ -63,9 +63,6 @@ static int config(struct vf_instance *vf, if (vo_config(video_out, width, height, d_width, d_height, flags, outfmt)) return 0; - // save vo's stride capability for the wanted colorspace: - vf->default_caps = video_out->default_caps; - return 1; } -- cgit v1.2.3