Merged the trunk r8852:8880

2012-07-02 11:04:43 +00:00
parent 304dac7f00
commit b368f99d03
60 changed files with 507 additions and 255 deletions
--- a/modules/video/src/precomp.hpp
+++ b/modules/video/src/precomp.hpp
@@ -52,6 +52,8 @@
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/core/internal.hpp"

+#include <list>
+
 #ifdef HAVE_TEGRA_OPTIMIZATION
 #include "opencv2/video/video_tegra.hpp"
 #endif