Alexander Alekhin c1c0f23fd1 Merge pull request #4004 from paroj:camera-api		2015-07-21 15:57:48 +00:00
..
include/opencv2	allow specifying apiPreference in VideoCapture when opening a file. Add	2015-07-08 13:46:56 +02:00
misc/java/test	Updated Manager for Android	2015-06-02 17:33:04 +03:00
perf	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +04:00
src	Merge pull request #4004 from paroj:camera-api	2015-07-21 15:57:48 +00:00
test	Merge pull request #4083 from mshabunin:java-engine	2015-06-03 17:17:36 +00:00
CMakeLists.txt	fix wrong usage of status(), remove useless message in videoio	2015-07-10 19:18:07 +03:00