Merge pull request #3520 from JoeHowse:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Dec 2014 11:14:29 +0000 (11:14 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Dec 2014 11:14:29 +0000 (11:14 +0000)
commitc0005fd2938ddeb6dcd8b9d1bcb602fdaaaddbe8
tree1fa9ba9adbe7ff4d2fd22ccc3f6c4db0b3330f6c
parentf12bd999bf653de3d9d8e7d236c7432c3195145c
parent13c04120ddd416f05fb345f67ba47554895d65eb
Merge pull request #3520 from JoeHowse:master
modules/videoio/include/opencv2/videoio.hpp