From 17160356eedd79dec4a3403b68d6f43e2bfacf49 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 27 Feb 2025 22:44:21 +0100 Subject: [PATCH 26/40] avcodec/mpegvideo_enc: Don't init matrices unnecessarily for MJPEG The MJPEG initialization happens later. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index e4b89983ad..81e004d1a8 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -361,6 +361,10 @@ static av_cold int init_matrices(MpegEncContext *s, AVCodecContext *avctx) if (s->out_format == FMT_MJPEG) { s->q_chroma_intra_matrix = s->q_intra_matrix + 32; s->q_chroma_intra_matrix16 = s->q_intra_matrix16 + 32; + // No need to set q_inter_matrix + av_assert1(s->intra_only); + // intra_matrix, chroma_intra_matrix will be set later for MJPEG. + return 0; } else { s->q_chroma_intra_matrix = s->q_intra_matrix; s->q_chroma_intra_matrix16 = s->q_intra_matrix16; -- 2.45.2