From 67b67003c56bd6a9aa2349589e9165c883ce0376 Mon Sep 17 00:00:00 2001 From: Vitaly Tuzov Date: Tue, 26 Jun 2018 14:04:02 +0300 Subject: [PATCH] Disable MSMF VideoCapture fallback to existing camera in case provided index is out of range. --- modules/videoio/src/cap_msmf.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/videoio/src/cap_msmf.cpp b/modules/videoio/src/cap_msmf.cpp index 501a0172c5..616a155c09 100644 --- a/modules/videoio/src/cap_msmf.cpp +++ b/modules/videoio/src/cap_msmf.cpp @@ -854,7 +854,8 @@ bool CvCapture_MSMF::configureOutput(UINT32 width, UINT32 height, double prefFra bool CvCapture_MSMF::open(int _index) { close(); - + if (_index < 0) + return false; _ComPtr msAttr = NULL; if (SUCCEEDED(MFCreateAttributes(&msAttr, 1)) && SUCCEEDED(msAttr->SetGUID( @@ -868,7 +869,6 @@ bool CvCapture_MSMF::open(int _index) { if (count > 0) { - _index = std::min(std::max(0, _index), (int)count - 1); for (int ind = 0; ind < (int)count; ind++) { if (ind == _index && ppDevices[ind]) -- GitLab