Alexander Alekhin 3ae1990727 Merge pull request #7769 from alalek:cmake_ffmpeg_cleanup		2016-12-01 20:24:05 +00: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	Merge pull request #7769 from alalek:cmake_ffmpeg_cleanup	2016-12-01 20:24:05 +00:00
test	test: ffmpeg: change resolution for H264 test	2016-07-21 00:20:18 +03:00
CMakeLists.txt	Basic support for GigE cameras via Aravis SDK	2016-10-07 21:55:49 +02:00