Skip to content

W
wine-cw
Commit 7da087b7 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

quartz/vmr9: Remove the "force" parameter of VMR9_maybe_init().

Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 1cb4b642
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
dlls/quartz/vmr9.c
View file @ 7da087b7
......@@ -387,7 +387,7 @@ static HRESULT initialize_device(struct quartz_vmr *filter, VMR9AllocationInfo *
return hr;
}
static HRESULT VMR9_maybe_init(struct quartz_vmr *filter, BOOL force, const AM_MEDIA_TYPE *mt)
static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE *mt)
{
VMR9AllocationInfo info = {};
HRESULT hr = E_FAIL;
......@@ -418,11 +418,9 @@ static HRESULT VMR9_maybe_init(struct quartz_vmr *filter, BOOL force, const AM_M
TRACE("Initializing in mode %u, our window %p, clipping window %p.\n",
filter->mode, filter->baseControlWindow.hwnd, filter->hWndClippingWindow);
if (filter->num_surfaces)
return S_OK;
if (filter->mode == VMR9Mode_Windowless && !filter->hWndClippingWindow)
return (force ? VFW_E_RUNTIME_ERROR : S_OK);
return S_OK;
info.dwWidth = filter->source_rect.right;
info.dwHeight = filter->source_rect.bottom;
......@@ -542,7 +540,7 @@ static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE
if (filter->mode
|| SUCCEEDED(hr = IVMRFilterConfig9_SetRenderingMode(&filter->IVMRFilterConfig9_iface, VMR9Mode_Windowed)))
hr = VMR9_maybe_init(filter, FALSE, mt);
hr = allocate_surfaces(filter, mt);
return hr;
}
......
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