Merge pull request #6769 from andy-held:cuda_optflow_error_calc
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 14 Jul 2016 12:24:24 +0000 (12:24 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 14 Jul 2016 12:24:24 +0000 (12:24 +0000)

Trivial merge