[FFmpeg-cvslog] Merge commit '136f55207521f0b03194ef5b55ba70f1635d6aee'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Mar 20 18:34:06 2017 +0100| [71d3d96c9f69bb676c8391f5536665abb2bcc542] | committer: Clément Bœsch

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 at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=71d3d96c9f69bb676c8391f5536665abb2bcc542
---