Merge pull request #2702 from GregoryMorse:patch-3
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 18 Sep 2014 12:38:54 +0000 (12:38 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 18 Sep 2014 12:38:54 +0000 (12:38 +0000)
commit1578dd1027b50b292218ea1b46ad40152c407b4d
treed70ff7ffa6dae719edb1d584d7006fd61cba0a4f
parent06e55ddf381acc0bcf5f0f9a5cb252ed143e978c
parentb5a4159efc6c1b7e73c6f114cbbb35093197b965
Merge pull request #2702 from GregoryMorse:patch-3
modules/videoio/src/cap_msmf.cpp
modules/videoio/src/cap_msmf.hpp