From fae7e3cd58f161d495c52f0a93b09a3284bf079a Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 27 Feb 2025 21:13:03 +0100 Subject: [PATCH 23/40] avcodec/mpegvideo_enc: Set chroma_intra_matrix for SpeedHQ Used with trellis; notice that inter_matrix is unused for (intra-only) SpeedHQ, so it is irrelevant that its value changes. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 79d6bfc056..11ebbe6a30 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -992,11 +992,8 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) } else if (s->out_format == FMT_H263 || s->out_format == FMT_H261) { s->intra_matrix[j] = s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i]; - } else if (CONFIG_SPEEDHQ_ENCODER && s->codec_id == AV_CODEC_ID_SPEEDHQ) { - s->intra_matrix[j] = - s->inter_matrix[j] = ff_mpeg1_default_intra_matrix[i]; } else { - /* MPEG-1/2 */ + /* MPEG-1/2, SpeedHQ */ s->chroma_intra_matrix[j] = s->intra_matrix[j] = ff_mpeg1_default_intra_matrix[i]; s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i]; -- 2.45.2