Alexander Alekhin 7d4bb9428b Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-08-20 19:30:18 +03:00
..
video	Update documentation and samples	2018-08-17 14:21:29 +03:00
video.hpp	next: drop DISABLE_OPENCV_24_COMPATIBILITY	2018-04-10 18:09:53 +03:00