Merge pull request #2986 from vbystricky:videoio_fix
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 21 Jul 2014 08:21:18 +0000 (08:21 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 21 Jul 2014 08:21:18 +0000 (08:21 +0000)

Trivial merge