From: James Almer <jamrial@gmail.com>
Date: Thu, 28 Sep 2017 15:53:42 +0000 (-0300)
Subject: Merge commit '8f5de34c8fb18fa1416e77d2cb998773a49ddb3d'
X-Git-Tag: n3.5-dev~164
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/e63e0b65446b16af4f2016fcd034a650f93f4b88?hp=47d6b02f6c3d58141ace48bb5e8971cae56f8874

Merge commit '8f5de34c8fb18fa1416e77d2cb998773a49ddb3d'

* commit '8f5de34c8fb18fa1416e77d2cb998773a49ddb3d':
  vf_fade: Make sure to not miss the last lines of a frame

This commit is a noop.

[11:00:43] <jamrial> michaelni: what do you think of 8f5de34c8f? does it apply to us?
[11:01:50] <jamrial> our code started to deviate with your commit bca59d7745e, followed by the merge commit aa40df483b2
[11:33:51] <michaelni> jamrial, the fade commits are from 2013, but i think our fixes where complete and the problematic slice_h FFALIGN is also removed

Merged-by: James Almer <jamrial@gmail.com>
---