Zebediah Figura : quartz/filesource: Don' t check formattype in FileAsyncReaderPin_CheckMediaType().
Alexandre Julliard
julliard at winehq.org
Thu Feb 21 14:50:14 CST 2019
Module: wine
Branch: master
Commit: 048474b15e8cbf43a0eec55bcaf24a10ecb5f819
URL: https://source.winehq.org/git/wine.git/?a=commit;h=048474b15e8cbf43a0eec55bcaf24a10ecb5f819
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Thu Feb 21 00:17:19 2019 -0600
quartz/filesource: Don't check formattype in FileAsyncReaderPin_CheckMediaType().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/filesource.c | 5 +----
dlls/quartz/tests/filesource.c | 2 --
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c
index df444ae..ab8d645 100644
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -756,11 +756,8 @@ static HRESULT WINAPI FileAsyncReaderPin_CheckMediaType(BasePin *pin, const AM_M
{
AM_MEDIA_TYPE *pmt_filter = impl_from_IBaseFilter(pin->pinInfo.pFilter)->pmt;
- FIXME("(%p, %p)\n", pin, pmt);
-
if (IsEqualGUID(&pmt->majortype, &pmt_filter->majortype) &&
- IsEqualGUID(&pmt->subtype, &pmt_filter->subtype) &&
- IsEqualGUID(&pmt->formattype, &FORMAT_None))
+ IsEqualGUID(&pmt->subtype, &pmt_filter->subtype))
return S_OK;
return S_FALSE;
diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c
index 9c94f61..845e74d 100644
--- a/dlls/quartz/tests/filesource.c
+++ b/dlls/quartz/tests/filesource.c
@@ -283,7 +283,6 @@ todo_wine
mt.lSampleSize = 123;
mt.formattype = FORMAT_VideoInfo;
hr = IPin_QueryAccept(pin, &mt);
-todo_wine
ok(hr == S_OK, "Got hr %#x.\n", hr);
mt.majortype = MEDIATYPE_Video;
@@ -376,7 +375,6 @@ todo_wine
mt.lSampleSize = 456;
mt.formattype = FORMAT_VideoInfo;
hr = IPin_QueryAccept(pin, &mt);
-todo_wine
ok(hr == S_OK, "Got hr %#x.\n", hr);
mt.majortype = MEDIATYPE_Stream;
More information about the wine-cvs
mailing list