[opencv] 65/89: Merge pull request #7806 from alalek:backport_7640

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 2.4.13.2
in repository opencv.

commit cf97e6e00fb019e3421c12f3890b754d9d035c94
Merge: bc96997 10d1b33
Author: Maksim Shabunin <maksim.shabunin at gmail.com>
Date:   Wed Dec 7 14:00:40 2016 +0000

    Merge pull request #7806 from alalek:backport_7640

 modules/video/perf/perf_tvl1optflow.cpp |  4 ++--
 modules/video/test/test_tvl1optflow.cpp | 37 ++++++++++++++++++---------------
 2 files changed, 22 insertions(+), 19 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git