Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 1 Apr 2021 21:48:52 +0000 (21:48 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 1 Apr 2021 21:48:52 +0000 (21:48 +0000)
commit12d80b9e643db1cfe7b2ad56694994485edbffd1
tree61f03a333cc00daac13f55b5ca5ec8d9d7fc5d1c
parentad333e0d22e3d8e92f478b20477edd4c6fbba5c0
parent6a72bf5085285446fb957cf928ca0305dc7f281e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/videoio/src/cap_dshow.cpp