strmbase: Return void from renderer_disconnect.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-03-11 17:21:59 -06:00 committed by Alexandre Julliard
parent 4bede3b27b
commit 26476fcf48
2 changed files with 3 additions and 8 deletions

View File

@ -512,16 +512,12 @@ static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE
return hr;
}
static HRESULT vmr_disconnect(struct strmbase_renderer *This)
static void vmr_disconnect(struct strmbase_renderer *This)
{
struct quartz_vmr *filter = impl_from_IBaseFilter(&This->filter.IBaseFilter_iface);
HRESULT hr = S_OK;
DWORD i;
if (!filter->mode)
return S_FALSE;
if (filter->allocator && filter->presenter)
if (filter->mode && filter->allocator && filter->presenter)
{
for (i = 0; i < filter->num_surfaces; ++i)
IDirect3DSurface9_Release(filter->surfaces[i]);
@ -530,7 +526,6 @@ static HRESULT vmr_disconnect(struct strmbase_renderer *This)
IVMRSurfaceAllocator9_TerminateDevice(filter->allocator, filter->cookie);
filter->num_surfaces = 0;
}
return hr;
}
static void vmr_free(struct quartz_vmr *filter)

View File

@ -313,7 +313,7 @@ struct strmbase_renderer_ops
void (*renderer_start_stream)(struct strmbase_renderer *iface);
void (*renderer_stop_stream)(struct strmbase_renderer *iface);
HRESULT (*renderer_connect)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt);
HRESULT (*renderer_disconnect)(struct strmbase_renderer *iface);
void (*renderer_disconnect)(struct strmbase_renderer *iface);
void (*renderer_destroy)(struct strmbase_renderer *iface);
HRESULT (*renderer_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out);
HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out);