generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed MSMF video capture initialization

Browse Source
This commit is contained in:
Artur Wieczorek 2014-09-22 19:35:36 +02:00
parent 9c91d0103f
commit a615102947
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/highgui/src/cap_msmf.cpp
View File

@ -2445,11 +2445,12 @@ int videoDevice::findType(unsigned int size, unsigned int frameRate)
fmt = vd_CaptureFormats.find(size); fmt = vd_CaptureFormats.find(size);
if( fmt != vd_CaptureFormats.end() ) if( fmt != vd_CaptureFormats.end() )
FRM = fmt->second; FRM = fmt->second;
else if (FRM.empty()) else if(!vd_CaptureFormats.empty())
return -1;
else
FRM = vd_CaptureFormats.rbegin()->second; FRM = vd_CaptureFormats.rbegin()->second;
if (FRM.empty())
return -1;
UINT64 frameRateMax = 0; SUBTYPEMap STMMax; UINT64 frameRateMax = 0; SUBTYPEMap STMMax;
if(frameRate == 0) if(frameRate == 0)
{ {