Merge pull request #11768 from alalek:videoio_msmf_async_live_capture
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 27 Jun 2018 18:12:10 +0000 (18:12 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 27 Jun 2018 18:12:10 +0000 (18:12 +0000)
1  2 
modules/videoio/src/cap_msmf.cpp

Simple merge