Alexander Alekhin 21e28adb87 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2020-05-22 19:50:14 +00:00
..
cmake	videoio: load debug versions of plug-ins in debug builds	2020-04-22 13:35:06 +03:00
doc	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-04-24 19:02:39 +00:00
include/opencv2	Merge pull request #16766 from VadimLevin:dev/vlevin/video_writer_params_constructor	2020-04-28 08:38:39 +00:00
misc	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-04-16 18:28:27 +00:00
perf	Merge pull request #15100 from Volskig:cam_multiplexing_function_v	2019-11-15 19:42:12 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-05-22 19:50:14 +00:00
test	videoio: added plug-in support to MSMF backend	2020-04-08 15:22:50 +03:00
CMakeLists.txt	videoio: load debug versions of plug-ins in debug builds	2020-04-22 13:35:06 +03:00