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)

Trivial merge