Alexander Alekhin d0f883524e cmake(osx): fix CoreImage error (#7916)		2016-12-23 11:30:17 +03:00
..
doc	Large update of videoio doc and samples following mshabunin comments	2016-09-09 18:46:11 +02:00
include/opencv2	videoio: preserve conflict with common properties	2016-12-01 15:37:12 +03:00
misc/java/test	Updated Manager for Android	2015-06-02 17:33:04 +03:00
perf
src	Fix for unhandled error cases when using Media Foundation	2016-12-13 10:40:06 +01:00
test	test: ffmpeg: change resolution for H264 test	2016-07-21 00:20:18 +03:00
CMakeLists.txt	cmake(osx): fix CoreImage error (#7916)	2016-12-23 11:30:17 +03:00