Alexander Alekhin ddcf388270 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-06-07 19:02:55 +03:00
..
cmake	Added videoio plugin for MediaSDK	2019-05-17 17:24:53 +03:00
doc	Docs: updated videoio module overview	2019-05-22 15:35:34 +03:00
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-07 19:02:55 +03:00
misc	cmake: fix pkg-config handling	2019-04-26 18:19:03 +03:00
perf	Merge pull request #13422 from mshabunin:split-videoio-cmake	2018-12-26 15:50:20 +03:00
src	FreeBSD build fix	2019-06-02 20:25:42 +01:00
test	Added videoio plugin for MediaSDK	2019-05-17 17:24:53 +03:00
CMakeLists.txt	Added videoio plugin for MediaSDK	2019-05-17 17:24:53 +03:00