Alexander Alekhin bd1fd59fc1 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-03-13 19:13:13 +00:00
..
cmake	Merge pull request #13970 from alalek:videoio_plugins_update	2019-03-05 11:48:39 +00:00
doc	videoio: drop obsolete backends	2018-11-07 19:49:09 +03:00
include/opencv2	videoio: revert registry chages, update cap.cpp	2019-03-04 21:37:20 +00:00
misc	bindings: backport generator from OpenCV 4.x	2019-03-01 20:18:48 +00:00
perf	Merge pull request #13422 from mshabunin:split-videoio-cmake	2018-12-26 15:50:20 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-03-13 19:13:13 +00:00
test	videoio: revert registry chages, update cap.cpp	2019-03-04 21:37:20 +00:00
CMakeLists.txt	Merge pull request #13970 from alalek:videoio_plugins_update	2019-03-05 11:48:39 +00:00