jormansa 3c2e12a744 bug fixed ... Conflicts: modules/highgui/src/cap_ffmpeg_impl.hpp		2015-05-24 13:31:07 +02:00
..
include/opencv2	Merge pull request #4047 from MSOpenTech:videoio-refactor-contrib	2015-05-23 09:02:11 +00:00
misc/java/test	Modified java wrapping mechanism	2015-03-02 18:12:30 +03:00
perf
src	bug fixed	2015-05-24 13:31:07 +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