Merge commit 'f2c469b73f8ac3dd6a98d38281f61b68ea6dd336'
authorJames Almer <jamrial@gmail.com>
Sat, 28 Oct 2017 21:08:41 +0000 (18:08 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 28 Oct 2017 21:08:41 +0000 (18:08 -0300)
commit1232b349175cf8882734300af727a4a1149a24d6
tree3d20e5aed356cda9ed491d6d65998ec5586045b5
parent859144fb1fffc671069e2e119c14de0b66b648c4
parentf2c469b73f8ac3dd6a98d38281f61b68ea6dd336
Merge commit 'f2c469b73f8ac3dd6a98d38281f61b68ea6dd336'

* commit 'f2c469b73f8ac3dd6a98d38281f61b68ea6dd336':
  mjpeg: Report non-3 component rgb lossless as not supported

[15:56:27] <jamrial> michaelni: can't reproduce the failure f2c469b73f is trying to "fix"
[15:56:30] <jamrial> do we support what that commit claims is unsupported?
[16:56:54] <michaelni> jamrial, yes, we support lossless rgba

This commit is a noop.

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