Merge commit '39a2d3288e82e4e576c03efb32179ef5a19fff50'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 15:31:16 +0000 (16:31 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 15:31:35 +0000 (16:31 +0100)
commitf8b09e90e92ca74c664d661c4f459bfa1d6383b5
tree3425abd30a019ee70276689aaba3c82e92586613
parentd3e1c6f975021ef5a096faa2d27e42922def63fb
parent39a2d3288e82e4e576c03efb32179ef5a19fff50
Merge commit '39a2d3288e82e4e576c03efb32179ef5a19fff50'

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

* commit '39a2d3288e82e4e576c03efb32179ef5a19fff50':
  mpegvideo: Refactor emulated_edge_mc calls

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>