From 04423c4f59e9e4a49ff2ef58191d80f1824f36d3 Mon Sep 17 00:00:00 2001 From: Andrew Talbot <Andrew.Talbot@talbotville.com> Date: Fri, 22 Sep 2006 18:50:12 +0100 Subject: [PATCH] quartz: Cast-qual warnings fix. --- dlls/quartz/acmwrapper.c | 3 ++- dlls/quartz/avidec.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index a6dda6b98df..f514f253712 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -169,8 +169,9 @@ static HRESULT ACMWrapper_ConnectInput(TransformFilterImpl* pTransformFilter, co TRACE("(%p)->(%p)\n", This, pmt); + /* Check root (GUID w/o FOURCC) */ if ((IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio)) && - (!memcmp(((char*)&pmt->subtype)+4, ((char*)&MEDIATYPE_Audio)+4, sizeof(GUID)-4)) && /* Check root (GUID w/o FOURCC) */ + (!memcmp(((const char *)&pmt->subtype)+4, ((const char *)&MEDIATYPE_Audio)+4, sizeof(GUID)-4)) && (IsEqualIID(&pmt->formattype, &FORMAT_WaveFormatEx))) { HACMSTREAM drv; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 01cb35d0002..8e7a6a0e351 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -157,9 +157,10 @@ static HRESULT AVIDec_ConnectInput(TransformFilterImpl* pTransformFilter, const TRACE("(%p)->(%p)\n", This, pmt); AVIDec_Cleanup(pTransformFilter); - + + /* Check root (GUID w/o FOURCC) */ if ((IsEqualIID(&pmt->majortype, &MEDIATYPE_Video)) && - (!memcmp(((char*)&pmt->subtype)+4, ((char*)&MEDIATYPE_Video)+4, sizeof(GUID)-4)) && /* Check root (GUID w/o FOURCC) */ + (!memcmp(((const char *)&pmt->subtype)+4, ((const char *)&MEDIATYPE_Video)+4, sizeof(GUID)-4)) && (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo))) { VIDEOINFOHEADER* format = (VIDEOINFOHEADER*)pmt->pbFormat;