This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit bb48d2dba211a980dbcf1e5ebc431a48e1121861 Author: Ramiro Polla <[email protected]> AuthorDate: Thu Jan 15 18:30:09 2026 +0100 Commit: Ramiro Polla <[email protected]> CommitDate: Fri Feb 20 16:32:10 2026 +0100 avcodec/mjpegdec: simplify decode_scan codepaths in ff_mjpeg_decode_sos() This will be helpful for the next commit. --- libavcodec/mjpegdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index efe3cb3c2c..f37bcbe9a9 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1817,7 +1817,8 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s) if (ret < 0) return ret; - } else if (s->lossless) { + } else { + if (s->lossless) { av_assert0(s->picture_ptr == s->picture); if (CONFIG_JPEGLS_DECODER && s->ls) { if ((ret = ff_jpegls_decode_picture(s)) < 0) @@ -1841,6 +1842,7 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s) return ret; } } + } if (s->avctx->codec_id == AV_CODEC_ID_MEDIA100 || s->avctx->codec_id == AV_CODEC_ID_MJPEGB || _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
