Alexander Alekhin 32df09c275 Merge pull request #7287 from seanm:master		2016-09-15 10:39:49 +00:00
..
doc	Large update of videoio doc and samples following mshabunin comments	2016-09-09 18:46:11 +02:00
include/opencv2	Merge pull request #7181 from valeriyvan:ioscleanup	2016-09-14 17:04:59 +00: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 #7287 from seanm:master	2016-09-15 10:39:49 +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