Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 2 Mar 2021 21:46:30 +0000 (21:46 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 2 Mar 2021 21:47:19 +0000 (21:47 +0000)
commitec4baf337aa8dec2d20d05fc1158feb3d9fecb67
tree5d07b897ffb8d75c7bf128e73e4a77abc5d80c68
parent325bdf952c012aec96778991140518b33f8f49a4
parent2ab1f3f166fccc3a01497209cc01c5cea44ff201
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/videoio/src/cap_ffmpeg_impl.hpp