tree 2e1566c08cec09b3b3cdabd83f4f44bb21644afe
parent 1992af1b9809528bff66f23aca993817eebc210b
author Yue Chen <yuec@google.com> 1485804152 -0800
committer Yue Chen <yuec@google.com> 1485813842 +0000

Fix conflicts between cb4x4 and warped_motion

Set mi_size properly in findSample()

Change-Id: I26bae25bf6300a107108dc5c2b7098e7d7dfa750