Alexander Alekhin ac4b592b4e Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2021-11-20 05:13:50 +00:00
..
cmake	Merge pull request #20614 from mshabunin:use-onevpl-load	2021-10-21 13:56:11 +00:00
doc	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2021-11-20 05:13:50 +00:00
include/opencv2	Merge pull request #19721 from MaximMilashchenko:Audio	2021-10-20 16:18:24 +03:00
misc	core(parallel): plugins support	2021-02-15 17:07:36 +00:00
perf	Merge pull request #15100 from Volskig:cam_multiplexing_function_v	2019-11-15 19:42:12 +03:00
src	modules/videoio/src/cap_ffmpeg_impl.hpp: fix build with gcc 4.8	2021-11-12 09:50:17 +01:00
test	Merge pull request #20942 from MaximMilashchenko:AudioPatch	2021-10-26 14:33:53 +00:00
CMakeLists.txt	videoio: fix plugins handling if no filesystem available	2021-10-06 17:29:00 +00:00