Merge pull request #3504 from a-wi:VideoCapture_get_const_v3
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 26 Dec 2014 14:37:47 +0000 (14:37 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 26 Dec 2014 14:37:47 +0000 (14:37 +0000)
1  2 
modules/videoio/include/opencv2/videoio.hpp
modules/videoio/src/cap_libv4l.cpp
modules/videoio/src/cap_openni2.cpp

Simple merge
Simple merge