Merge pull request #19934 from alalek:videoio_plugin_query_api

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

Sat, 24 Apr 2021 18:13:05 +0000 (18:13 +0000)

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

Sat, 24 Apr 2021 18:13:05 +0000 (18:13 +0000)
author Alexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 24 Apr 2021 18:13:05 +0000 (18:13 +0000)
committer Alexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 24 Apr 2021 18:13:05 +0000 (18:13 +0000)
diff --cc modules/videoio/src/backend_plugin.cpp
Simple merge
diff --cc modules/videoio/src/videoio_registry.cpp
Simple merge
author	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Sat, 24 Apr 2021 18:13:05 +0000 (18:13 +0000)
committer	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Sat, 24 Apr 2021 18:13:05 +0000 (18:13 +0000)
		1	2
modules/videoio/src/backend_plugin.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/videoio/src/videoio_registry.cpp	patch \|	diff1 \|	diff2 \|	blob \| history