From a615102947f35f7da449f69e71b91f7f2ece4364 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Mon, 22 Sep 2014 19:35:36 +0200 Subject: [PATCH] Fixed MSMF video capture initialization --- modules/highgui/src/cap_msmf.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/highgui/src/cap_msmf.cpp b/modules/highgui/src/cap_msmf.cpp index cc522e1..c2507e9 100644 --- a/modules/highgui/src/cap_msmf.cpp +++ b/modules/highgui/src/cap_msmf.cpp @@ -2445,11 +2445,12 @@ int videoDevice::findType(unsigned int size, unsigned int frameRate) fmt = vd_CaptureFormats.find(size); if( fmt != vd_CaptureFormats.end() ) FRM = fmt->second; - else if (FRM.empty()) - return -1; - else + else if(!vd_CaptureFormats.empty()) FRM = vd_CaptureFormats.rbegin()->second; + if (FRM.empty()) + return -1; + UINT64 frameRateMax = 0; SUBTYPEMap STMMax; if(frameRate == 0) { -- 2.7.4