Merge pull request #6649 from adamrankin:msmf_crash_fix

e3844e0f · Alexander Alekhin · 1b6e0279 · 2577194c · e3844e0f
Commit e3844e0f authored Jun 08, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cap_msmf.cpp modules/videoio/src/cap_msmf.cpp +1 -1

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