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_flip.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'video/filter/vf_flip.c') diff --git a/video/filter/vf_flip.c b/video/filter/vf_flip.c index 49d6993023..aa9fbaf0da 100644 --- a/video/filter/vf_flip.c +++ b/video/filter/vf_flip.c @@ -40,14 +40,14 @@ static int config(struct vf_instance *vf, static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi) { mpi->planes[0]=mpi->planes[0]+ - mpi->stride[0]*(mpi->height-1); + mpi->stride[0]*(mpi->h-1); mpi->stride[0]=-mpi->stride[0]; if(mpi->flags&MP_IMGFLAG_PLANAR){ mpi->planes[1]=mpi->planes[1]+ - mpi->stride[1]*((mpi->height>>mpi->chroma_y_shift)-1); + mpi->stride[1]*((mpi->h>>mpi->chroma_y_shift)-1); mpi->stride[1]=-mpi->stride[1]; mpi->planes[2]=mpi->planes[2]+ - mpi->stride[2]*((mpi->height>>mpi->chroma_y_shift)-1); + mpi->stride[2]*((mpi->h>>mpi->chroma_y_shift)-1); mpi->stride[2]=-mpi->stride[2]; } return mpi; -- cgit v1.2.3