quartz: Return void from basic_video_init().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
883679031b
commit
a17d43d67d
|
@ -214,7 +214,7 @@ typedef struct BaseControlVideoFuncTable
|
||||||
BaseControlVideo_SetTargetRect pfnSetTargetRect;
|
BaseControlVideo_SetTargetRect pfnSetTargetRect;
|
||||||
} BaseControlVideoFuncTable;
|
} BaseControlVideoFuncTable;
|
||||||
|
|
||||||
HRESULT basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter,
|
void basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter,
|
||||||
struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) DECLSPEC_HIDDEN;
|
struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) DECLSPEC_HIDDEN;
|
||||||
HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo) DECLSPEC_HIDDEN;
|
HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
|
|
|
@ -647,13 +647,11 @@ static const IBasicVideoVtbl basic_video_vtbl =
|
||||||
basic_video_IsUsingDefaultDestination
|
basic_video_IsUsingDefaultDestination
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter,
|
void basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter,
|
||||||
struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table)
|
struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table)
|
||||||
{
|
{
|
||||||
video->IBasicVideo_iface.lpVtbl = &basic_video_vtbl;
|
video->IBasicVideo_iface.lpVtbl = &basic_video_vtbl;
|
||||||
video->pFilter = filter;
|
video->pFilter = filter;
|
||||||
video->pPin = pin;
|
video->pPin = pin;
|
||||||
video->pFuncsTable = func_table;
|
video->pFuncsTable = func_table;
|
||||||
|
|
||||||
return S_OK;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -716,10 +716,8 @@ HRESULT video_renderer_create(IUnknown *outer, IUnknown **out)
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
hr = basic_video_init(&object->baseControlVideo, &object->renderer.filter,
|
basic_video_init(&object->baseControlVideo, &object->renderer.filter,
|
||||||
&object->renderer.sink.pin, &renderer_BaseControlVideoFuncTable);
|
&object->renderer.sink.pin, &renderer_BaseControlVideoFuncTable);
|
||||||
if (FAILED(hr))
|
|
||||||
goto fail;
|
|
||||||
|
|
||||||
if (FAILED(hr = BaseWindowImpl_PrepareWindow(&object->baseControlWindow.baseWindow)))
|
if (FAILED(hr = BaseWindowImpl_PrepareWindow(&object->baseControlWindow.baseWindow)))
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
|
@ -2326,10 +2326,8 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid)
|
||||||
if (FAILED(hr = BaseWindowImpl_PrepareWindow(&object->baseControlWindow.baseWindow)))
|
if (FAILED(hr = BaseWindowImpl_PrepareWindow(&object->baseControlWindow.baseWindow)))
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
hr = basic_video_init(&object->baseControlVideo, &object->renderer.filter,
|
basic_video_init(&object->baseControlVideo, &object->renderer.filter,
|
||||||
&object->renderer.sink.pin, &renderer_BaseControlVideoFuncTable);
|
&object->renderer.sink.pin, &renderer_BaseControlVideoFuncTable);
|
||||||
if (FAILED(hr))
|
|
||||||
goto fail;
|
|
||||||
|
|
||||||
object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL);
|
object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue