Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 21 Aug 2020 19:57:34 +0000 (19:57 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 21 Aug 2020 19:57:34 +0000 (19:57 +0000)
commitf6c2bf21c8fc305b731711cd993d58e3b6a89a9e
tree133d32171aba61397110f6e2f3a965d36c671744
parent8cc2cbf1c466ba56892b7e8adabca7ec13026add
parentf53ff0d01c45760926bc995c208cc50f743b5309
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/core/src/umatrix.cpp
modules/features2d/src/brisk.cpp
modules/flann/include/opencv2/flann.hpp
modules/imgproc/include/opencv2/imgproc.hpp
modules/videoio/src/cap_ffmpeg_impl.hpp