Revert "quartz: Reaching a renderer in the filtergraph is not an error."
Lei Zhang
thestig at google.com
Fri Nov 14 16:00:08 CST 2008
On Fri, Nov 14, 2008 at 1:54 PM, Maarten Lankhorst
<maarten at codeweavers.com> wrote:
> This is plain wrong, input pin and output pin are supposed to be connected
> to each other, not the input pin being connected to a renderer pin and NOT
> reaching output pin
> ---
>
> From 0f91e8a67c88d1ec0871c772679871249fd7625f Mon Sep 17 00:00:00 2001
> From: Maarten Lankhorst <maarten at codeweavers.com>
> Date: Fri, 14 Nov 2008 22:50:34 +0100
> Subject: [PATCH] Revert "quartz: Reaching a renderer in the filtergraph is
> not an error."
>
> This reverts commit 62a0bd65d2fe9febd6928ff5912e84a34f76a97f.
> ---
> dlls/quartz/filtergraph.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
> index b249724..c53771e 100644
> --- a/dlls/quartz/filtergraph.c
> +++ b/dlls/quartz/filtergraph.c
> @@ -1042,8 +1042,9 @@ static HRESULT WINAPI
> FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut,
> if (SUCCEEDED(hr)) {
> unsigned int i;
> if (nb == 0) {
> - TRACE("Reached a renderer\n");
> - break;
> + IPin_Disconnect(ppinfilter);
> + IPin_Disconnect(ppinOut);
> + goto error;
> }
> TRACE("pins to consider: %d\n", nb);
> for(i = 0; i < nb; i++)
> --
> 1.5.6.5
>
>
>
>
>
Correct, I got this one wrong. Please revert my patch and apply
Maarten's patch to fix infinite recursion.
More information about the wine-devel
mailing list