This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch release/6.1 in repository ffmpeg.
commit ea4b3f6e37edaf0609510b36d06bfe443b1fb1ef Author: Ramiro Polla <[email protected]> AuthorDate: Mon Jan 19 18:04:12 2026 +0100 Commit: Michael Niedermayer <[email protected]> CommitDate: Mon May 4 17:13:14 2026 +0200 avcodec/mjpegdec: fix segfault on extern_huff and no extradata Regression since 1debadd58e. (cherry picked from commit 96d8e1972025834c49ee153f976f8e6b1836d5ab) Signed-off-by: Michael Niedermayer <[email protected]> --- libavcodec/mjpegdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index f7af154578..f4a3ce51c7 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -150,7 +150,7 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) if ((ret = init_default_huffman_tables(s)) < 0) return ret; - if (s->extern_huff) { + if (s->extern_huff && avctx->extradata) { av_log(avctx, AV_LOG_INFO, "using external huffman table\n"); if ((ret = init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size * 8)) < 0) return ret; _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
