[FFmpeg-cvslog] avcodec/mpegvideo_enc: Set chroma_intra_matrix for SpeedHQ

[Andreas Rheinhardt]

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Thu Feb 27 21:13:03 2025 +0100| [7223363ccb2c9ac4afe1b9fc824ddabc768a1014] | committer: Andreas Rheinhardt

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 at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7223363ccb2c9ac4afe1b9fc824ddabc768a1014
---

 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];