Alexander Alekhin ba7b0f4c54 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-12-15 11:23:46 +00:00
..
cmake	Merge pull request #15351 from philippefoubert:pr_ximea	2019-08-21 00:01:34 +03:00
doc	videoio(doc): fix 'since' version	2019-08-20 13:15:56 +03:00
include/opencv2	videoio: retrieve encoded frames through FFmpeg backend	2019-11-18 19:23:19 +03:00
misc	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-11-19 19:48:49 +00:00
perf	Merge pull request #15100 from Volskig:cam_multiplexing_function_v	2019-11-15 19:42:12 +03:00
src	videoio(plugins): relax version check for FFmpeg wrapper on Windows	2019-12-09 14:47:38 +03:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-11-19 19:48:49 +00:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-12-15 11:23:46 +00:00