Fixes: Null pointer dereference
Fixes: sample1.dng
Found-by: South East <8billion.peo...@gmail.com>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavcodec/mjpegdec.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 86ec58713cb..ef4fc075b21 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -468,6 +468,10 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
if (s->avctx->height <= 0)
return AVERROR_INVALIDDATA;
}
+ if (s->bayer && s->progressive) {
+ avpriv_request_sample(s->avctx, "progressively coded bayer picture");
+ return AVERROR_INVALIDDATA;
+ }
if (s->got_picture && s->interlaced && (s->bottom_field ==
!s->interlace_polarity)) {
if (s->progressive) {
--
2.47.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
