mjpeg: Report non-3 component rgb lossless as not supported
authorLuca Barbato <lu_zero@gentoo.org>
Mon, 17 Apr 2017 19:11:57 +0000 (19:11 +0000)
committerLuca Barbato <lu_zero@gentoo.org>
Thu, 20 Apr 2017 15:39:18 +0000 (15:39 +0000)
Bug-Id: 1043
CC: libav-stable@libav.org
libavcodec/mjpegdec.c

index 13d3e8c..296ca59 100644 (file)
@@ -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;