summaryrefslogtreecommitdiffstats
path: root/libavcodec/mjpegdec.c
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2017-04-17 19:11:57 +0000
committerLuca Barbato <lu_zero@gentoo.org>2017-04-20 15:39:18 +0000
commitf2c469b73f8ac3dd6a98d38281f61b68ea6dd336 (patch)
treecd6f900e88b6aab1ce271dd688872df33ec24cae /libavcodec/mjpegdec.c
parent279e3aaa14daba6b7a37d75f3fb6e29c732d123f (diff)
downloadffmpeg-streaming-f2c469b73f8ac3dd6a98d38281f61b68ea6dd336.zip
ffmpeg-streaming-f2c469b73f8ac3dd6a98d38281f61b68ea6dd336.tar.gz
mjpeg: Report non-3 component rgb lossless as not supported
Bug-Id: 1043 CC: libav-stable@libav.org
Diffstat (limited to 'libavcodec/mjpegdec.c')
-rw-r--r--libavcodec/mjpegdec.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 13d3e8c..296ca59 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;
OpenPOWER on IntegriCloud