Merge remote-tracking branch 'upstream/3.4' into merge-3.4

author Alexander Alekhin <alexander.a.alekhin@gmail.com>

Thu, 5 Nov 2020 18:59:10 +0000 (18:59 +0000)

committer Alexander Alekhin <alexander.a.alekhin@gmail.com>

Thu, 5 Nov 2020 18:59:10 +0000 (18:59 +0000)
author Alexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 5 Nov 2020 18:59:10 +0000 (18:59 +0000)
committer Alexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 5 Nov 2020 18:59:10 +0000 (18:59 +0000)
diff --cc modules/videoio/src/cap_mfx_reader.cpp
Simple merge
diff --cc modules/videoio/src/cap_mfx_reader.hpp
Simple merge
diff --cc modules/videoio/test/test_mfx.cpp
Simple merge
author	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Thu, 5 Nov 2020 18:59:10 +0000 (18:59 +0000)
committer	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Thu, 5 Nov 2020 18:59:10 +0000 (18:59 +0000)
		1	2
modules/videoio/src/cap_mfx_reader.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/videoio/src/cap_mfx_reader.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/videoio/test/test_mfx.cpp	patch \|	diff1 \|	diff2 \|	blob \| history