[FFmpeg-cvslog] avcodec/mpeg12enc: Always initialize MPEG-2 intra VLC table lengths

Andreas Rheinhardt git at videolan.org
Wed Nov 25 02:30:56 EET 2020

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Tue Nov 24 13:29:29 2020 +0100| [ef3c1670d488d1cffc98115a5e67b07ee921e47d] | committer: Andreas Rheinhardt

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

Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

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

 libavcodec/mpeg12enc.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c
index 46c3424de9..eee4af0adc 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 */

More information about the ffmpeg-cvslog mailing list