Merge commit '45df7adc1d9b7e8fbae5af9328baa6ab3562002b'
authorJames Almer <jamrial@gmail.com>
Wed, 8 Nov 2017 16:53:26 +0000 (13:53 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 8 Nov 2017 16:53:26 +0000 (13:53 -0300)
commit5fd6fa0ca7f32d800a6044d28fb33a88e8de7283
tree04424af36ffcc24da7afbc61fd50675f9d09019d
parent975db5dcc2edd6e374eee7050f67ad529c69ddde
parent45df7adc1d9b7e8fbae5af9328baa6ab3562002b
Merge commit '45df7adc1d9b7e8fbae5af9328baa6ab3562002b'

* commit '45df7adc1d9b7e8fbae5af9328baa6ab3562002b':
  imgutils: add function to clear an image to black
  lavc, lavu: move frame cropping to a convenience function
  rmdec: add missing brackets to compound statement

This commit is a noop, see
65b83ce01b94eae944290c11257799a9288f2d4c
caa12027baf1180453846c58da08fc87accc0ff6
463b81de2b252691d75417643597c42684bf830d

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