From: Andreas Rheinhardt Date: Tue, 24 Nov 2020 12:29:29 +0000 (+0100) Subject: avcodec/mpeg12enc: Always initialize MPEG-2 intra VLC table lengths X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;ds=sidebyside;h=ef3c1670d488d1cffc98115a5e67b07ee921e47d;p=ffmpeg avcodec/mpeg12enc: Always initialize MPEG-2 intra VLC table lengths The MPEG-1/2 encoders initialize several tables once during the first time one of the encoders is initialized; the table for MPEG-2 intra VLC lengths is only initialized if it is used for this encoder instance. This implies that if the first MPEG-1/2 encoder to be initialized does not use it, it will never be initialized even if a later encoder instance makes use of them. Fix this by initializing this table unconditionally. Reviewed-by: Michael Niedermayer Signed-off-by: Andreas Rheinhardt --- diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 46c3424de9b..eee4af0adcf 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -1055,7 +1055,6 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s) } init_uni_ac_vlc(&ff_rl_mpeg1, uni_mpeg1_ac_vlc_len); - if (s->intra_vlc_format) init_uni_ac_vlc(&ff_rl_mpeg2, uni_mpeg2_ac_vlc_len); /* build unified dc encoding tables */