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/filter/vf_vo.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'video/filter/vf_vo.c') diff --git a/video/filter/vf_vo.c b/video/filter/vf_vo.c index 93ca91b2b1..bb29684b10 100644 --- a/video/filter/vf_vo.c +++ b/video/filter/vf_vo.c @@ -113,12 +113,7 @@ static int control(struct vf_instance *vf, int request, void *data) static int query_format(struct vf_instance *vf, unsigned int fmt) { - int flags = video_out->driver->query_format(video_out, fmt); - // draw_slice() accepts stride, draw_frame() doesn't: - if (flags) - if (fmt == IMGFMT_YV12 || fmt == IMGFMT_I420 || fmt == IMGFMT_IYUV) - flags |= VFCAP_ACCEPT_STRIDE; - return flags; + return video_out->driver->query_format(video_out, fmt); } static void uninit(struct vf_instance *vf) -- cgit v1.2.3