Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 9 Dec 2020 18:09:00 +0000 (18:09 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 9 Dec 2020 18:09:00 +0000 (18:09 +0000)
commitde385009ae9aa84f3c93e1322a541e2dd6308900
treea574e47a53f89047274af6cdf6da1956fc332438
parent114848d313cfc5c5af656d5dfc90391da1a2401c
parent8286d84fb150c307a34615503086aca0ab553826
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
cmake/OpenCVCompilerOptions.cmake
cmake/OpenCVModule.cmake
cmake/OpenCVUtils.cmake
modules/core/CMakeLists.txt
modules/dnn/src/layers/convolution_layer.cpp
modules/dnn/src/layers/fully_connected_layer.cpp
modules/dnn/src/layers/resize_layer.cpp
modules/dnn/src/tensorflow/tf_importer.cpp
modules/dnn/test/test_tf_importer.cpp
modules/videoio/src/cap_gstreamer.cpp
modules/videoio/test/test_video_io.cpp