Commit 7bf59055 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

winegstreamer: Make sure the pipeline state is NULL before removing output pins.

Source pads can be created asynchronously, so they might not be created until during the call to gst_element_set_state(). Therefore don't copy This->ppPins into a local variable. This condition can be triggered by failing to demux a stream. Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAndrew Eikum <aeikum@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 3201cee7
...@@ -1913,7 +1913,6 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) ...@@ -1913,7 +1913,6 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This)
{ {
HRESULT hr; HRESULT hr;
ULONG i; ULONG i;
GSTOutPin **ppOldPins = This->ppPins;
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
mark_wine_thread(); mark_wine_thread();
...@@ -1927,17 +1926,17 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) ...@@ -1927,17 +1926,17 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This)
This->my_src = This->their_sink = NULL; This->my_src = This->their_sink = NULL;
for (i = 0; i < This->cStreams; i++) { for (i = 0; i < This->cStreams; i++) {
hr = BaseOutputPinImpl_BreakConnect(&ppOldPins[i]->pin); hr = BaseOutputPinImpl_BreakConnect(&This->ppPins[i]->pin);
TRACE("Disconnect: %08x\n", hr); TRACE("Disconnect: %08x\n", hr);
IPin_Release(&ppOldPins[i]->pin.pin.IPin_iface); IPin_Release(&This->ppPins[i]->pin.pin.IPin_iface);
} }
This->cStreams = 0; This->cStreams = 0;
CoTaskMemFree(This->ppPins);
This->ppPins = NULL; This->ppPins = NULL;
gst_element_set_bus(This->container, NULL); gst_element_set_bus(This->container, NULL);
gst_object_unref(This->container); gst_object_unref(This->container);
This->container = NULL; This->container = NULL;
BaseFilterImpl_IncrementPinVersion(&This->filter); BaseFilterImpl_IncrementPinVersion(&This->filter);
CoTaskMemFree(ppOldPins);
return S_OK; return S_OK;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment