Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 10 Jul 2021 13:01:03 +0000 (13:01 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 10 Jul 2021 13:01:03 +0000 (13:01 +0000)
commit9e42e04b4a4c11059d067faa2bcb63f4736bd54b
tree0abf55992a0e16417f382679dce5ed3faa98397b
parent9103837228fd55ca424afe5b40c77eb25f847698
parent167a12028daa7b8b0f52fc828b9693c161cc01f4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/dnn/src/onnx/onnx_importer.cpp
modules/highgui/src/window_QT.cpp
modules/videoio/src/container_avi.cpp