Alexander Alekhin 09799402f9 Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2020-05-06 19:53:51 +00:00

..

doc

Merge pull request #13104 from alalek:docs_fix_bib_Kroeger2016

2018-11-10 20:11:28 +03:00

include/opencv2

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2020-04-21 21:32:51 +00:00

misc

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2019-04-13 20:00:54 +00:00

perf

video(DIS): use OpenCL shared mem

2019-05-03 18:58:26 +00:00

src

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2020-05-06 19:53:51 +00:00

test

Merge pull request #14473 from alalek:video_dis_update_opencl

2019-05-29 14:22:21 +03:00

CMakeLists.txt

build: fix js build (make video->calib3d dependency optional)

2018-08-31 14:29:25 +03:00