diff options
author | wm4 <wm4@nowhere> | 2015-04-10 21:06:18 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-04-10 21:06:25 +0200 |
commit | 37a71e57d404a708505f920f610061ec5c424917 (patch) | |
tree | 000ad1e9657175bd2fc9c8a77795d0f8abc8e766 /video/mp_image.h | |
parent | 41151122e73f82d0bc9a806c80165878e930dc07 (diff) | |
download | mpv-37a71e57d404a708505f920f610061ec5c424917.tar.bz2 mpv-37a71e57d404a708505f920f610061ec5c424917.tar.xz |
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.
Diffstat (limited to 'video/mp_image.h')
-rw-r--r-- | video/mp_image.h | 3 |
1 files changed, 1 insertions, 2 deletions
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]; |