Merge pull request #6649 from adamrankin:msmf_crash_fix

2016-06-08 16:30:55 +00:00
parent 1b6e02793c 2577194c70
commit e3844e0f26
1 changed files with 1 additions and 1 deletions
--- a/modules/videoio/src/cap_msmf.cpp
+++ b/modules/videoio/src/cap_msmf.cpp
@@ -2580,7 +2580,7 @@ bool videoDevice::setupDevice(unsigned int id)

 bool videoDevice::setupDevice(unsigned int w, unsigned int h, unsigned int idealFramerate)
 {
-    unsigned int id = findType(w * h, idealFramerate);
+    int id = findType(w * h, idealFramerate);
    if( id < 0 )
        return false;