summaryrefslogtreecommitdiffstats
path: root/video/out/vo_opengl.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-10 02:02:24 +0100
committerwm4 <wm4@nowhere>2013-01-13 17:39:32 +0100
commitd77d9fb933e0e7dc34de02f3d0c13791ddd80114 (patch)
treeca45e0f9d753e7ee7b5bd142eb2aed1638bf391c /video/out/vo_opengl.c
parent1568161aadf24ee3a6d982612b7380f8b1dc4a58 (diff)
downloadmpv-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_opengl.c')
-rw-r--r--video/out/vo_opengl.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index 759cb96ba7..fc94a86eac 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -1350,11 +1350,8 @@ static mp_image_t *get_screenshot(struct gl_priv *p)
image->planes[n], image->stride[n]);
}
gl->ActiveTexture(GL_TEXTURE0);
-
- image->w = p->image_width;
- image->h = p->image_height;
- image->display_w = p->vo->aspdat.prew;
- image->display_h = p->vo->aspdat.preh;
+ mp_image_set_size(image, p->image_width, p->image_height);
+ mp_image_set_display_size(image, p->vo->aspdat.prew, p->vo->aspdat.preh);
mp_image_set_colorspace_details(image, &p->colorspace);