Merge pull request #11164 from corleypc:master

pull/11071/head
Vadim Pisarevsky 7 years ago
commit 00fff3a85d
  1. 8
      modules/videoio/src/cap_dshow.cpp

@ -2912,7 +2912,7 @@ HRESULT videoInput::getDevice(IBaseFilter** gottaFilter, int deviceId, WCHAR * w
// Enumerate the monikers.
IMoniker *pMoniker = NULL;
ULONG cFetched;
while ((pEnumCat->Next(1, &pMoniker, &cFetched) == S_OK) && (!done))
while ((!done) && (pEnumCat->Next(1, &pMoniker, &cFetched) == S_OK))
{
if(deviceCounter == deviceId)
{
@ -2951,6 +2951,12 @@ HRESULT videoInput::getDevice(IBaseFilter** gottaFilter, int deviceId, WCHAR * w
pMoniker = NULL;
}
}
else
{
// cleaning for the case when this isn't the device we are looking for
pMoniker->Release();
pMoniker = NULL;
}
deviceCounter++;
}
pEnumCat->Release();

Loading…
Cancel
Save