Alexander Alekhin 66e09bc9a4 Merge pull request #10260 from native-api:ffmpeg_load_from_package		2017-12-08 20:58:17 +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 #10260 from native-api:ffmpeg_load_from_package	2017-12-08 20:58:17 +00:00
test	Merge pull request #10060 from allnes:videoio_tests_backend	2017-12-01 09:38:19 +00:00
CMakeLists.txt	Merge pull request #9779 from Lightricks:feature/assetslibrary-remove-link	2017-10-06 11:45:36 +00:00