Merge commit '136f55207521f0b03194ef5b55ba70f1635d6aee'
authorClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 17:34:06 +0000 (18:34 +0100)
committerClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 17:34:06 +0000 (18:34 +0100)
* commit '136f55207521f0b03194ef5b55ba70f1635d6aee':
  mpegvideo_motion: Handle edge emulation even without unrestricted_mv

This commit is a noop, see 7b1e0beb2da31a0a8847bc9c68a87a120b71fa8a

Merged-by: Clément Bœsch <u@pkh.me>

Trivial merge