From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Date: Wed, 13 Apr 2016 15:31:16 +0000 (+0100)
Subject: Merge commit '39a2d3288e82e4e576c03efb32179ef5a19fff50'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f8b09e90e92ca74c664d661c4f459bfa1d6383b5;p=ffmpeg

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

f8b09e90e92ca74c664d661c4f459bfa1d6383b5