Revert "Merge pull request #249 from taka-no-me:tvl1_max_rmse"

This reverts commit 62af76c6468598d68182d01523d118e12809ee9b, reversing
changes made to 962884cdec1767e832b3364227fcb9479c36c354.
Merge branch 'master' of https://github.com/kazuki-ma/opencv
Merge branch 'master' of https://github.com/kazuki-ma/opencv

Conflicts:
	modules/video/test/test_tvl1optflow.cpp
Merge branch 'master' of https://github.com/kazuki-ma/opencv