From 37a71e57d404a708505f920f610061ec5c424917 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 10 Apr 2015 21:06:18 +0200 Subject: mp_image: remove redundant flags field Because gcc (and clang) is a goddamn PITA and unnecessarily warns if the universal initializer for structs is used (like mp_image x = {}) and the first member of the struct is also a struct, move the w/h fields to the top. --- video/mp_image.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'video/mp_image.h') diff --git a/video/mp_image.h b/video/mp_image.h index 92f779136c..7f29467f24 100644 --- a/video/mp_image.h +++ b/video/mp_image.h @@ -77,7 +77,7 @@ struct mp_image_params { * image data. mp_image_make_writeable() will do that copy if required. */ typedef struct mp_image { - unsigned int flags; // same as fmt.flags + int w, h; // visible dimensions (redundant with params.w/h) struct mp_image_params params; @@ -86,7 +86,6 @@ typedef struct mp_image { enum mp_imgfmt imgfmt; int num_planes; - int w,h; // visible dimensions uint8_t *planes[MP_MAX_PLANES]; int stride[MP_MAX_PLANES]; -- cgit v1.2.3