Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 5 Nov 2020 18:59:10 +0000 (18:59 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 5 Nov 2020 18:59:10 +0000 (18:59 +0000)
commit7459613623a36aa7e0c78baca046073006409396
tree1f9cf1170050f6c6a1da7c073a7e359ffe04d3a3
parent07736c912fc9e266ef900757f6f5164aac1c27db
parentfb69620a2756c873ba2bbb14ac31d69ec6e5af5c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/videoio/src/cap_mfx_reader.cpp
modules/videoio/src/cap_mfx_reader.hpp
modules/videoio/test/test_mfx.cpp