Merge pull request #3077 from kenlck:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 11 Aug 2014 16:41:30 +0000 (16:41 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 11 Aug 2014 16:41:30 +0000 (16:41 +0000)
commitf937f4d951763edcec3d6fafae8191767b6d6431
tree1b371c7be92031b08c7340136657c151169691f0
parent6df1198e8b1ea4925cbce943a1dc6549f27d8be2
parent911e1bd1e40aabac0d0bfdcb20b30fd71fb386dd
Merge pull request #3077 from kenlck:master
modules/videoio/src/cap_pvapi.cpp