Giles Payne 0d1a0b126b Merge pull request #14005 from komakai:android-video-cap ...

* Add Android Media NDK video i/o file capture back-end

* Fix failing test

* Improve error handling/prevent resource leaks

* Add license text

* Modify default for WITH_ANDROID_MEDIANDK option

* Fix spelling of deleter_AMediaExtractor

2019-03-19 21:28:45 +03:00

..

calib3d

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

2019-03-13 19:13:13 +00:00

core

core: cache dir version update

2019-03-18 19:17:54 +03:00

dnn

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

2019-03-15 22:42:57 +00:00

features2d

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

2019-01-22 18:00:34 +00:00

flann

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

2019-02-19 19:49:13 +00:00

gapi

[G-API] Allow unused nodes in Fluid backend

2019-03-18 18:20:11 +03:00

highgui

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

2019-03-06 11:43:16 +03:00

imgcodecs

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

2019-03-15 22:42:57 +00:00

imgproc

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

2019-03-13 19:13:13 +00:00

java

android: don't install java/build.gradle

2019-03-13 18:52:15 +00:00

js

Backport commits from

2019-03-13 13:32:44 +03:00

ml

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

2019-03-15 22:42:57 +00:00

objdetect

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

2019-01-22 18:00:34 +00:00

photo

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

2019-03-13 19:13:13 +00:00

python

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

2019-03-15 22:42:57 +00:00

stitching

Merge pull request #13947 from JoeHowse:4.0.1-patches

2019-03-02 19:00:32 +03:00

ts

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

2018-12-03 18:38:27 +03:00

video

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

2019-03-11 19:20:22 +00:00

videoio

Merge pull request #14005 from komakai:android-video-cap

2019-03-19 21:28:45 +03:00

world

Merge pull request #13422 from mshabunin:split-videoio-cmake

2018-12-26 15:50:20 +03:00

CMakeLists.txt

cmake: allow providing list of extra modules paths

2018-02-01 19:02:02 +03:00