1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00

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 <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-02-27 21:13:03 +01:00
parent daff2df1a0
commit 7223363ccb

View File

@ -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) { } else if (s->out_format == FMT_H263 || s->out_format == FMT_H261) {
s->intra_matrix[j] = s->intra_matrix[j] =
s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i]; 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 { } else {
/* MPEG-1/2 */ /* MPEG-1/2, SpeedHQ */
s->chroma_intra_matrix[j] = s->chroma_intra_matrix[j] =
s->intra_matrix[j] = ff_mpeg1_default_intra_matrix[i]; s->intra_matrix[j] = ff_mpeg1_default_intra_matrix[i];
s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i]; s->inter_matrix[j] = ff_mpeg1_default_non_intra_matrix[i];