diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-02 21:32:19 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-06 15:00:21 +0200 |
| commit | 40e4ddf61943404582b5506b7b7ab487c4025864 (patch) | |
| tree | 67a7179d3ec603e84752ab9c8ef7dd5d061eb0a7 | |
| parent | 406c7fceeb9b0cfb82e6a8fd7e12c3e7aeb4bdeb (diff) | |
| download | ffmpeg-40e4ddf61943404582b5506b7b7ab487c4025864.tar.gz | |
avcodec/mpegvideo_enc: Move SpeedHQ check to speedhqenc.c
Also set this only once and not for every frame.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 3 | ||||
| -rw-r--r-- | libavcodec/speedhqenc.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 06c3ff4cbe..f16fc1aaed 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3753,9 +3753,6 @@ static int encode_picture(MpegEncContext *s, int picture_number) s->chroma_intra_matrix, s->intra_quant_bias, 8, 8, 1); s->qscale = 8; } - } else if (s->out_format == FMT_SPEEDHQ) { - s->y_dc_scale_table= - s->c_dc_scale_table= ff_mpeg2_dc_scale_table[3]; } //FIXME var duplication diff --git a/libavcodec/speedhqenc.c b/libavcodec/speedhqenc.c index 4a009bd070..4c1d76631b 100644 --- a/libavcodec/speedhqenc.c +++ b/libavcodec/speedhqenc.c @@ -36,6 +36,7 @@ #include "mpeg12data.h" #include "mpeg12vlc.h" #include "mpegvideo.h" +#include "mpegvideodata.h" #include "mpegvideoenc.h" #include "speedhqenc.h" @@ -111,6 +112,9 @@ av_cold int ff_speedhq_encode_init(MpegEncContext *s) s->intra_chroma_ac_vlc_length = s->intra_chroma_ac_vlc_last_length = uni_speedhq_ac_vlc_len; + s->y_dc_scale_table = + s->c_dc_scale_table = ff_mpeg2_dc_scale_table[3]; + switch (s->avctx->pix_fmt) { case AV_PIX_FMT_YUV420P: s->avctx->codec_tag = MKTAG('S','H','Q','0'); |