[FFmpeg-cvslog] Merge commit 'f2c469b73f8ac3dd6a98d38281f61b68ea6dd336'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Oct 28 18:08:41 2017 -0300| [1232b349175cf8882734300af727a4a1149a24d6] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1232b349175cf8882734300af727a4a1149a24d6
---