Merge pull request #3325 from a-wi:Dshow_capture_v3
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 11 Oct 2014 16:04:02 +0000 (16:04 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 11 Oct 2014 16:04:02 +0000 (16:04 +0000)
commitb4c3f465fb96cd25953fea097f764e98b128c1b2
tree07894ffe48d96c0f543610c30bbb3f85b508c0b8
parenta3916113b9a034ab8668b7f087bfc1632a86ea32
parentec93d103b72cb9437cce11e1b93a1522c710d70d
Merge pull request #3325 from a-wi:Dshow_capture_v3