Merge branch 'master' of https://github.com/Itseez/opencv_contrib

modules/bioinspired/samples/retinaDemo.cpp

@@ -11,6 +11,7 @@
 
 #include "opencv2/bioinspired.hpp"
 #include "opencv2/imgcodecs.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 
 static void help(std::string errorMessage)

modules/tracking/perf/perf_precomp.hpp

@@ -12,6 +12,7 @@
 #include "opencv2/ts.hpp"
 #include <opencv2/imgproc.hpp>
 #include <opencv2/tracking.hpp>
+#include <opencv2/videoio.hpp>
 #include <opencv2/highgui.hpp>
 
 #ifdef GTEST_CREATE_SHARED_LIBRARY

modules/tracking/samples/benchmark.cpp

@@ -1,5 +1,6 @@
 #include <opencv2/core/utility.hpp>
 #include <opencv2/tracking.hpp>
+#include <opencv2/videoio.hpp>
 #include <opencv2/highgui.hpp>
 #include <iostream>
 #include <time.h>

modules/tracking/samples/tracker.cpp

@@ -1,5 +1,6 @@
 #include <opencv2/core/utility.hpp>
 #include <opencv2/tracking.hpp>
+#include <opencv2/videoio.hpp>
 #include <opencv2/highgui.hpp>
 #include <iostream>
 #include <cstring>

modules/tracking/test/test_precomp.hpp

@@ -14,5 +14,6 @@
 #include "opencv2/imgproc.hpp"
 #include "opencv2/tracking.hpp"
 #include "opencv2/highgui.hpp"
+#include "opencv2/videoio.hpp"
 
 #endif