Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 8 Jun 2021 05:04:57 +0000 (05:04 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 8 Jun 2021 05:04:57 +0000 (05:04 +0000)
1  2 
modules/videoio/src/cap_dshow.cpp

Simple merge