From 1b9d4a771a27d6017d826ed03dfbbc7ee976bf77 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 12 Dec 2012 23:55:41 +0100 Subject: video: remove things related to old DR code Remove mp_image.width/height. The w/h members are the ones to use. width/height were used internally by vf_get_image(), and sometimes for other purposes. Remove some image flags, most of which are now useless or completely unused. This includes VFCAP_ACCEPT_STRIDE: the vf_expand insertion in vf.c does nothing. Remove some other unused mp_image fields. Some rather messy changes in vo_opengl[_old] to get rid of legacy mp_image flags and fields. This is left from when vo_gl supported DR. --- video/out/vo_x11.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'video/out/vo_x11.c') diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c index 58c709e471..b323c34865 100644 --- a/video/out/vo_x11.c +++ b/video/out/vo_x11.c @@ -530,20 +530,17 @@ static int query_format(struct vo *vo, uint32_t format) return 0; // TODO 8bpp not yet fully implemented if (IMGFMT_BGR_DEPTH(format) == vo->x11->depthonscreen) return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | - VFCAP_OSD | VFCAP_FLIP | - VFCAP_ACCEPT_STRIDE; + VFCAP_OSD | VFCAP_FLIP; else return VFCAP_CSP_SUPPORTED | VFCAP_OSD | - VFCAP_FLIP | - VFCAP_ACCEPT_STRIDE; + VFCAP_FLIP; } switch (format) { case IMGFMT_I420: case IMGFMT_IYUV: case IMGFMT_YV12: - return VFCAP_CSP_SUPPORTED | VFCAP_OSD | - VFCAP_ACCEPT_STRIDE; + return VFCAP_CSP_SUPPORTED | VFCAP_OSD; } return 0; } -- cgit v1.2.3