Merge remote-tracking branch 'remotes/origin/master' into tvl1_chambolle

Conflicts: modules/video/doc/motion_analysis_and_object_tracking.rst
2014-08-17 22:08:12 +02:00
parent 6594d52185 dea40e5e99
commit fae69df9a9
601 changed files with 38192 additions and 444389 deletions
--- a/modules/video/src/tvl1flow.cpp
+++ b/modules/video/src/tvl1flow.cpp
@@ -73,7 +73,7 @@
 */

 #include "precomp.hpp"
-#include "opencl_kernels.hpp"
+#include "opencl_kernels_video.hpp"

 #include <limits>
 #include <iomanip>