Merge pull request #2947 from vbystricky:capDShow
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 14 Jul 2014 18:53:25 +0000 (18:53 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 14 Jul 2014 18:53:25 +0000 (18:53 +0000)

Trivial merge