Merge pull request #11856 from alalek:videoio_msmf_fix_check
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 30 Jun 2018 04:52:36 +0000 (04:52 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 30 Jun 2018 04:52:36 +0000 (04:52 +0000)
1  2 
modules/videoio/src/cap_msmf.cpp

Simple merge