Giles Payne b9b65e9392 Fix Android NDK camera's color format conversions		2021-04-04 12:39:29 +09:00
..
calib3d	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2021-03-13 13:02:18 +00:00
core	Merge tag '4.5.2'	2021-04-02 17:30:52 +00:00
dnn	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2021-04-01 09:54:57 +00:00
features2d	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2021-03-22 12:05:23 +00:00
flann	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-12-20 18:40:22 +00:00
gapi	Merge pull request #19833 from alalek:workaround_19678	2021-04-02 10:37:29 +00:00
highgui	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2021-02-21 20:14:09 +00:00
imgcodecs	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2021-03-06 17:31:08 +00:00
imgproc	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2021-04-01 09:54:57 +00:00
java	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2021-02-27 17:41:57 +00:00
js	Merge pull request #19771 from lionkunonly:opencvjsNodeFix	2021-04-01 12:29:48 +00:00
ml	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2021-03-22 12:05:23 +00:00
objc	cmake: fix tracking detail headers	2021-04-01 12:21:18 +00:00
objdetect	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2021-03-06 17:31:08 +00:00
photo	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-12-18 20:47:56 +00:00
python	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2021-04-01 21:48:52 +00:00
stitching	Merge pull request #19619 from amirtu:OCV-221_get_and_set_cameras_on_stitcher	2021-03-09 17:51:40 +00:00
ts	valgrind: filter out hardware-accelerated videoio tests	2021-03-17 08:59:56 +00:00
video	cmake: fix tracking detail headers	2021-04-01 12:21:18 +00:00
videoio	Fix Android NDK camera's color format conversions	2021-04-04 12:39:29 +09:00
world	Merge pull request #13422 from mshabunin:split-videoio-cmake	2018-12-26 15:50:20 +03:00
CMakeLists.txt