Merge pull request #4083 from mshabunin:java-engine

2015-06-03 17:17:36 +00:00
parent fd1b30fc6f 7ee79b73f6
commit 39fdcf4df3
161 changed files with 521 additions and 38215 deletions
--- a/modules/videoio/test/test_precomp.hpp
+++ b/modules/videoio/test/test_precomp.hpp
@@ -39,7 +39,6 @@
    defined(HAVE_INTELPERC)    || \
    defined(HAVE_GPHOTO2)      || \
    (0)
-    //defined(HAVE_ANDROID_NATIVE_CAMERA) ||   - enable after #1193
 #  define BUILD_WITH_CAMERA_SUPPORT 1
 #else
 #  define BUILD_WITH_CAMERA_SUPPORT 0