Merge pull request #8609 from LukeZheZhu:pyrlk_err_ocl_fix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 4 May 2017 16:12:13 +0000 (16:12 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 4 May 2017 16:12:13 +0000 (16:12 +0000)

Trivial merge