[FFmpeg-cvslog] avcodec/mpegvideo: Restrict resetting mbskip_table to MPEG-4 decoder

Andreas Rheinhardt git at videolan.org
Wed Jun 12 14:15:27 EEST 2024


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat May  4 17:06:31 2024 +0200| [3a4e7694a13edc185a00393c2e6872ff3e17756b] | committer: Andreas Rheinhardt

avcodec/mpegvideo: Restrict resetting mbskip_table to MPEG-4 decoder

This is done due to invalid input and therefore the encoder is not
affected by it.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 libavcodec/mpegvideo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index d82a89566c..4b1f882105 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -616,7 +616,7 @@ int ff_mpv_init_context_frame(MpegEncContext *s)
         }
         if (s->codec_id == AV_CODEC_ID_MPEG4) {
             ALLOC_POOL(mbskip_table, mb_array_size + 2,
-                       FF_REFSTRUCT_POOL_FLAG_ZERO_EVERY_TIME);
+                       !s->encoding ? FF_REFSTRUCT_POOL_FLAG_ZERO_EVERY_TIME : 0);
             if (!s->encoding) {
                 /* cbp, pred_dir */
                 if (!(s->cbp_table      = av_mallocz(mb_array_size)) ||



More information about the ffmpeg-cvslog mailing list