Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 2 Oct 2021 17:57:18 +0000 (17:57 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 2 Oct 2021 17:57:18 +0000 (17:57 +0000)
commit37c3f0d8a04e370037cfb5c090c60de2eb16d071
tree7998d54b4a51be3f35296d5dc00b9aee7c377e76
parent627be179c1d1035cdc4042f2c557c302da827736
parent48c985e7753bbe29ec014ddeddd8e583b1c18aab
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
doc/tutorials/app/video_input_psnr_ssim.markdown
modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp
modules/imgproc/include/opencv2/imgproc.hpp
modules/imgproc/src/hough.cpp
modules/java/android_sdk/build.gradle.in
modules/python/src2/hdr_parser.py
modules/videoio/src/cap_gstreamer.cpp