Alexander Alekhin 12d80b9e64 Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2021-04-01 21:48:52 +00:00

..

cmake

gstreamer: add video module

2021-02-26 12:51:03 +03:00

doc

videoio(doc): add 'videoio_hwaccel' group, fix typos

2021-03-07 04:47:22 +00:00

include/opencv2

videoio(doc): add 'videoio_hwaccel' group, fix typos

2021-03-07 04:47:22 +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-04-01 21:48:52 +00:00

test

ffmpeg/4.x: update FFmpeg wrapper 2021.03

2021-03-03 11:41:36 +00:00

CMakeLists.txt

Merge pull request #19597 from komakai:android-ndk-camera

2021-02-25 19:14:11 +00:00