StevenPuttemans 8454a8f2d1 adding extra buffer parameter ... Conflicts: modules/highgui/include/opencv2/highgui/highgui_c.h modules/highgui/src/cap_dc1394_v2.cpp fix typo		2015-05-26 18:08:22 +02:00
..
include/opencv2	adding extra buffer parameter	2015-05-26 18:08:22 +02:00
misc/java/test	Modified java wrapping mechanism	2015-03-02 18:12:30 +03:00
perf	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +04:00
src	adding extra buffer parameter	2015-05-26 18:08:22 +02:00
test	VideoCapture with digital camera and gPhoto2 library	2015-05-21 00:41:39 +02:00
CMakeLists.txt	VideoCapture with digital camera and gPhoto2 library	2015-05-21 00:41:39 +02:00