Merge commit 'a638e9184d63e57e67901f34afe919fd56fd3ac4'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 21 Apr 2016 15:52:03 +0000 (16:52 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 21 Apr 2016 15:52:03 +0000 (16:52 +0100)
commitaa40df483b210ec95154848e068300ccd055286f
tree6dfc8b3d2d606431b33046e0f3ddad9c264b79a9
parent5f587b1daf90a8c0bf4f2eb5c13b4022252ec498
parenta638e9184d63e57e67901f34afe919fd56fd3ac4
Merge commit 'a638e9184d63e57e67901f34afe919fd56fd3ac4'

* commit 'a638e9184d63e57e67901f34afe919fd56fd3ac4':
  vf_fade: make sure the slice end is always in the frame

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavfilter/vf_fade.c