Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 23 Oct 2021 15:33:31 +0000 (15:33 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 23 Oct 2021 15:33:31 +0000 (15:33 +0000)
commit6a2077cbd8a8a0d8cbd3e0e8c3ca239f17e6c067
tree4dad630cab6b7d55fb46f4fafa952771c01aa134
parent9267536feefa0e0c5ca6f1113b6e22debe438ddf
parentaa11cc19e8f89882c65dee26d3922fb0796c76ac
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/calib3d/src/calibration.cpp
modules/core/src/system.cpp
modules/imgcodecs/src/grfmt_bmp.cpp
modules/imgcodecs/test/test_grfmt.cpp
modules/imgproc/src/hough.cpp
modules/imgproc/test/test_convhull.cpp
modules/videoio/src/cap_ffmpeg_impl.hpp