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)
commit1b5fe9162498c54a28651d73dd5e66713e62ddc4
tree3c9d24f6482793894f15b6865db7bdcc1f742272
parent1a305cadb3f46dae6bb3efb5551e1e91f6dda33b
parentbbcd06f42f9c63bfa935f44f85b1561bd72d4566
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/videoio/src/cap_dshow.cpp