Merge commit '39a2d328'

This commit is a no-op. Ours are not identical / refactorable.

* commit '39a2d328':
  mpegvideo: Refactor emulated_edge_mc calls
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>