projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad333e0 6a72bf5)
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)
1  2 
modules/videoio/src/cap_dshow.cpp patch | diff1 | diff2 | blob | history

diff --cc modules/videoio/src/cap_dshow.cpp
Simple merge
Domain: Multimedia / Media Vision;