Maksim Shabunin b9ea59df35 Merge pull request #6995 from PkLab:i6746_naming_videoio_enums		2016-08-15 09:01:24 +00:00
..
include/opencv2	Naming some enumerations in videoio	2016-08-11 20:27:42 +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 #7062 from kurenai:return_if_camera_disconnected	2016-08-11 14:07:42 +00:00
test	test: ffmpeg: change resolution for H264 test	2016-07-21 00:20:18 +03:00
CMakeLists.txt	- removed whitespaces	2016-01-25 13:13:13 +01:00