Alexander Alekhin 52a60526f1 Merge pull request #9492 from paroj:ximea_serial		2017-08-28 19:33:54 +00:00
..
doc	Large update of videoio doc and samples following mshabunin comments	2016-09-09 18:46:11 +02:00
include/opencv2	some improvements on tutorials	2017-07-29 20:08:19 +03:00
misc	videoio: do not mix CV_CAP and CAP_ APIs enum values	2017-06-25 23:35:33 +03:00
perf	Rewritten some tests in videoio and imgcodecs modules	2017-06-20 18:20:41 +03:00
src	Merge pull request #9492 from paroj:ximea_serial	2017-08-28 19:33:54 +00:00
test	Merge pull request #9091 from alalek:update_ffmpeg	2017-07-14 17:25:35 +00:00
CMakeLists.txt	cmake: CMP0022 NEW	2017-08-19 15:15:05 +00:00