From f6f8dc7782a411d1befadcc8425990451047f6cf Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 29 Apr 2014 13:31:59 +0200 Subject: video: remove redundant mp_image display_w/_h members Commit 5e4e248 added a mp_image_params field to mp_image, and moved many parameters to that struct. display_w/h was left redundant with mp_image_params.d_w/d_h. These fields were supposed to be always in sync, but it seems some code forgot to do this correctly, such as vf_fix_img_params() or mp_image_copy_attributes(). This led to the problem in github issue #756, because display_w/_h could become incorrect. It turns out that most code didn't use the old fields anyway. Just remove them. Note that mp_image_params.d_w/d_h are supposed to be always valid, so the additional checks for 0 shouldn't be needed. Remove these checks as well. Fixes #756. --- video/image_writer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'video/image_writer.c') diff --git a/video/image_writer.c b/video/image_writer.c index b27f8660b2..af1dab294c 100644 --- a/video/image_writer.c +++ b/video/image_writer.c @@ -264,8 +264,8 @@ int write_image(struct mp_image *image, const struct image_writer_opts *opts, { struct mp_image *allocated_image = NULL; struct image_writer_opts defs = image_writer_opts_defaults; - int d_w = image->display_w ? image->display_w : image->w; - int d_h = image->display_h ? image->display_h : image->h; + int d_w = image->params.d_w; + int d_h = image->params.d_h; bool is_anamorphic = image->w != d_w || image->h != d_h; if (!opts) -- cgit v1.2.3