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)
commit71d3d96c9f69bb676c8391f5536665abb2bcc542
tree510599cc05e6d3f5f44879425706a4c79c2e241c
parent6d43533286fa14cf27f2217faab75a51c9ca30d2
parent136f55207521f0b03194ef5b55ba70f1635d6aee
Merge commit '136f55207521f0b03194ef5b55ba70f1635d6aee'

* 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>