From 9aa83af89a60186d98871a83b726ef28a3026505 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Thu, 13 Mar 2008 21:42:22 -0700 Subject: [PATCH] quartz: Exclude MERIT_DO_NOT_USE filters from being automatically added to the stream Else NullRenderer will be used for renderering --- dlls/quartz/filtergraph.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index c6e2c22..747f88d 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -778,7 +778,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, /* Try to find a suitable filter that can connect to the pin to render */ tab[0] = mt->majortype; tab[1] = mt->subtype; - hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, 0, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); + hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); if (FAILED(hr)) { ERR("Unable to enum filters (%x)\n", hr); return hr; @@ -931,7 +931,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, /* Try to find a suitable renderer with the same media type */ tab[0] = mt->majortype; tab[1] = GUID_NULL; - hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, 0, TRUE, 1, tab, NULL, NULL, TRUE, FALSE, 0, NULL, NULL, NULL); + hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, TRUE, FALSE, 0, NULL, NULL, NULL); if (FAILED(hr)) { ERR("Unable to enum filters (%x)\n", hr); return hr; @@ -1057,7 +1057,7 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface, if (SUCCEEDED(hr)) { tab[0] = mt.majortype; tab[1] = mt.subtype; - hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, 0, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); + hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); } if (FAILED(hr)) -- 1.5.4.1