[FFmpeg-cvslog] mjpeg: Report non-3 component rgb lossless as not supported

[Luca Barbato]

ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Mon Apr 17 19:11:57 2017 +0000| [f2c469b73f8ac3dd6a98d38281f61b68ea6dd336] | committer: Luca Barbato

mjpeg: Report non-3 component rgb lossless as not supported

Bug-Id: 1043
CC: libav-stable at libav.org

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

 libavcodec/mjpegdec.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 13d3e8cb02..296ca59018 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1129,6 +1129,12 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask,
     for (i = s->mjpb_skiptosod; i > 0; i--)
         skip_bits(&s->gb, 8);
 
+    if (s->lossless && s->rgb && nb_components != 3) {
+        avpriv_request_sample(s->avctx,
+                              "Lossless RGB image without 3 components");
+        return AVERROR_PATCHWELCOME;
+    }
+
 next_field:
     for (i = 0; i < nb_components; i++)
         s->last_dc[i] = 1024;