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/decode/vd_lavc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'video/decode/vd_lavc.c') diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 120555b283..3ee8cc7932 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -733,8 +733,7 @@ static int decode(struct sh_video *sh, struct demux_packet *packet, void *data, struct mp_image new = {0}; new.type = MP_IMGTYPE_EXPORT; new.flags = MP_IMGFLAG_PRESERVE; - new.w = new.width = avctx->width; - new.h = new.height = avctx->height; + mp_image_set_size(&new, avctx->width, avctx->height); mp_image_setfmt(&new, ctx->best_csp); for (int i = 0; i < 4; i++) { new.planes[i] = pic->data[i]; -- cgit v1.2.3