Vadim Pisarevsky bc547c4290 Merge pull request #10124 from zhongwuzw:master		2017-11-28 10:53:00 +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 #10124 from zhongwuzw:master	2017-11-28 10:53:00 +00:00
test	videoio: fixed capture open order, added apiPrefernce to FFMPEG tests	2017-11-23 13:33:48 +03:00
CMakeLists.txt	Merge pull request #9779 from Lightricks:feature/assetslibrary-remove-link	2017-10-06 11:45:36 +00:00