Fixed MSMF video capture initialization

a6151029 · Artur Wieczorek · 9c91d010 · a6151029
Commit a6151029 authored Sep 22, 2014 by Artur Wieczorek
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

cap_msmf.cpp modules/highgui/src/cap_msmf.cpp +4 -3

No files found.
--- 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)
    {