Merge pull request #3152 from PhilLab:VideoCaptureFix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 26 Aug 2014 16:02:46 +0000 (16:02 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 26 Aug 2014 16:02:46 +0000 (16:02 +0000)

Trivial merge