diff options
author | wm4 <wm4@nowhere> | 2012-11-10 02:02:24 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-01-13 17:39:32 +0100 |
commit | d77d9fb933e0e7dc34de02f3d0c13791ddd80114 (patch) | |
tree | ca45e0f9d753e7ee7b5bd142eb2aed1638bf391c /video/out/vo_x11.c | |
parent | 1568161aadf24ee3a6d982612b7380f8b1dc4a58 (diff) | |
download | mpv-d77d9fb933e0e7dc34de02f3d0c13791ddd80114.tar.bz2 mpv-d77d9fb933e0e7dc34de02f3d0c13791ddd80114.tar.xz |
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.
Diffstat (limited to 'video/out/vo_x11.c')
-rw-r--r-- | video/out/vo_x11.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c index 98ebc7f6d1..58c709e471 100644 --- a/video/out/vo_x11.c +++ b/video/out/vo_x11.c @@ -419,8 +419,7 @@ static void Display_Image(struct priv *p, XImage *myximage, uint8_t *ImageData) static struct mp_image get_x_buffer(struct priv *p) { struct mp_image img = {0}; - img.w = img.width = p->image_width; - img.h = img.height = p->image_height; + mp_image_set_size(&img, p->image_width, p->image_height); mp_image_setfmt(&img, p->out_format); img.planes[0] = p->ImageData; |