Merge remote-tracking branch 'itseez/opencv'

Conflicts:
	modules/video/src/simpleflow.cpp
	modules/video/test/test_simpleflow.cpp

diff --cc modules/video/src/simpleflow.cpp
index 9571fe4,6b4264a..7f327b1
--- 1/modules/video/src/simpleflow.cpp
--- 2/modules/video/src/simpleflow.cpp
+++ b/modules/video/src/simpleflow.cpp
@@@ -561,8 -555,8 +561,8 @@@ CV_EXPORTS_W void calcOpticalFlowSF(Mat
      Mat new_speed_up, new_speed_up_inv;
  
      selectPointsToRecalcFlow(flow,
 -                             averaging_block_size,
 +                             averaging_radius,
-                              speed_up_thr,
+                              (int)speed_up_thr,
                               curr_rows,
                               curr_cols,
                               speed_up,