From d77d9fb933e0e7dc34de02f3d0c13791ddd80114 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 10 Nov 2012 02:02:24 +0100 Subject: mp_image: require using mp_image_set_size() for setting w/h Setting the size of a mp_image must be done with mp_image_set_size() now. Do this to guarantee that the redundant fields (like chroma_width) are updated consistently. Replacing the redundant fields by function calls would probably be better, but there are too many uses of them, and is a bit less convenient. Most code actually called mp_image_setfmt(), which did this as well. This commit just makes things a bit more explicit. Warning: the video filter chain still sets up mp_images manually, and vf_get_image() is not updated. --- video/out/vo_image.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'video/out/vo_image.c') diff --git a/video/out/vo_image.c b/video/out/vo_image.c index 7862ceb596..12bd18862a 100644 --- a/video/out/vo_image.c +++ b/video/out/vo_image.c @@ -101,8 +101,7 @@ static void draw_image(struct vo *vo, mp_image_t *mpi) struct priv *p = vo->priv; mp_image_t img = *mpi; - img.display_w = p->d_width; - img.display_h = p->d_height; + mp_image_set_display_size(&img, p->d_width, p->d_height); mp_image_set_colorspace_details(&img, &p->colorspace); void *t = talloc_new(NULL); -- cgit v1.2.3