Zebediah Figura : qcap: Get rid of V4l_Unprepare().
Alexandre Julliard
julliard at winehq.org
Thu Apr 11 13:10:30 CDT 2019
Module: wine
Branch: master
Commit: b42f79129d416db4c791ac732c5ec37b043bbf6c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b42f79129d416db4c791ac732c5ec37b043bbf6c
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Wed Apr 10 22:31:59 2019 -0500
qcap: Get rid of V4l_Unprepare().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/qcap/v4l.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c
index 809ce7a..752751a 100644
--- a/dlls/qcap/v4l.c
+++ b/dlls/qcap/v4l.c
@@ -131,11 +131,6 @@ static HRESULT V4l_Prepare(Capture *device)
return S_OK;
}
-static void V4l_Unprepare(Capture *device)
-{
- heap_free(device->image_data);
-}
-
HRESULT qcap_driver_destroy(Capture *capBox)
{
TRACE("%p\n", capBox);
@@ -439,7 +434,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam)
if (FAILED(hr) && hr != VFW_E_NOT_CONNECTED)
{
TRACE("Return %x, stop IFilterGraph\n", hr);
- V4l_Unprepare(capBox);
+ heap_free(capBox->image_data);
capBox->thread = 0;
capBox->stopped = TRUE;
break;
@@ -559,7 +554,7 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state)
if (hr != S_OK && hr != VFW_E_NOT_COMMITTED)
WARN("Decommitting allocator: %x\n", hr);
}
- V4l_Unprepare(capBox);
+ heap_free(capBox->image_data);
}
*state = State_Stopped;
More information about the wine-cvs
mailing list