Merge pull request #8798 from BKNio:fix_motionEstimation
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 29 May 2017 14:31:03 +0000 (14:31 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 29 May 2017 14:31:03 +0000 (14:31 +0000)

Trivial merge