Module: wine Branch: master Commit: f5c4ae7c10a505d77f7764aa260e1cbfb0966bd3 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5c4ae7c10a505d77f7764aa260e1cb...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Jul 18 19:55:55 2023 +0200
strmbase: Use nameless unions/structs.
---
libs/strmbase/mediatype.c | 6 +++--- libs/strmbase/strmbase_private.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/libs/strmbase/mediatype.c b/libs/strmbase/mediatype.c index 33af6f2e636..90c9bd01206 100644 --- a/libs/strmbase/mediatype.c +++ b/libs/strmbase/mediatype.c @@ -132,10 +132,10 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt) if (vih->dwInterlaceFlags) TRACE("interlace flags %#lx, ", vih->dwInterlaceFlags); if (vih->dwCopyProtectFlags) TRACE("copy-protection flags %#lx, ", vih->dwCopyProtectFlags); TRACE("aspect ratio %lu/%lu, ", vih->dwPictAspectRatioX, vih->dwPictAspectRatioY); - if (vih->u.dwControlFlags) TRACE("control flags %#lx, ", vih->u.dwControlFlags); - if (vih->u.dwControlFlags & AMCONTROL_COLORINFO_PRESENT) + if (vih->dwControlFlags) TRACE("control flags %#lx, ", vih->dwControlFlags); + if (vih->dwControlFlags & AMCONTROL_COLORINFO_PRESENT) { - const DXVA_ExtendedFormat *colorimetry = (const DXVA_ExtendedFormat *)&vih->u.dwControlFlags; + const DXVA_ExtendedFormat *colorimetry = (const DXVA_ExtendedFormat *)&vih->dwControlFlags;
TRACE("chroma site %#x, range %#x, matrix %#x, lighting %#x, primaries %#x, transfer function %#x, ", colorimetry->VideoChromaSubsampling, colorimetry->NominalRange, colorimetry->VideoTransferMatrix, diff --git a/libs/strmbase/strmbase_private.h b/libs/strmbase/strmbase_private.h index 9ac0b24bb1a..cf702a279c2 100644 --- a/libs/strmbase/strmbase_private.h +++ b/libs/strmbase/strmbase_private.h @@ -22,8 +22,6 @@ #define __WINE_STRMBASE_PRIVATE_H
#include <assert.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #define COBJMACROS #include "dshow.h" #include "uuids.h"