Alexander Alekhin 3e2b05b096 Merge pull request #8274 from abratchik:mser.brisk.3.0.0-rc1		2017-03-06 10:22:29 +00:00
..
doc	Large update of videoio doc and samples following mshabunin comments	2016-09-09 18:46:11 +02:00
include/opencv2	Fix misplaced description CAP_PROP_SETTINGS and others minor changes in videoio doc	2017-01-26 17:10:32 +01: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 #8274 from abratchik:mser.brisk.3.0.0-rc1	2017-03-06 10:22:29 +00:00
test	test: ffmpeg: change resolution for H264 test	2016-07-21 00:20:18 +03:00
CMakeLists.txt	cmake: append '-framework UIKit' for videoio/imgcodecs module	2017-02-21 13:37:37 +03:00