Alexander Alekhin 1b5fe91624 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2021-06-08 05:04:57 +00:00
..
cmake	Merge pull request #19755 from mikhail-nikolskiy:ffmpeg-umat	2021-05-14 16:48:50 +00:00
doc	videoio(doc): add 'videoio_hwaccel' group, fix typos	2021-03-07 04:47:22 +00:00
include/opencv2	Merge pull request #19755 from mikhail-nikolskiy:ffmpeg-umat	2021-05-14 16:48:50 +00: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	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2021-06-08 05:04:57 +00:00
test	videoio(test): bailout from VP9 tests if first frame can't be read	2021-05-28 02:05:45 +00:00
CMakeLists.txt	Merge pull request #19755 from mikhail-nikolskiy:ffmpeg-umat	2021-05-14 16:48:50 +00:00