[FFmpeg-cvslog] avcodec/mpeg_er: Don't set block_index unnecessarily

Andreas Rheinhardt git at videolan.org
Thu Jun 20 20:01:08 EEST 2024


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Wed Jun 12 08:37:53 2024 +0200| [65d5ccb808ec93de46a2458ea8cc082ce4460f34] | committer: Andreas Rheinhardt

avcodec/mpeg_er: Don't set block_index unnecessarily

ff_init_block_index() sets MpegEncContext.dest and
MpegEncContext.block_index. The latter is unused by
ff_mpv_reconstruct_mb() (which is what this code is
preparatory for) and dest is overwritten a few lines below.
So don't initialize block_index at all.

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

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

 libavcodec/mpeg_er.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libavcodec/mpeg_er.c b/libavcodec/mpeg_er.c
index e7b3197bb1..fe7dcd7efb 100644
--- a/libavcodec/mpeg_er.c
+++ b/libavcodec/mpeg_er.c
@@ -76,10 +76,6 @@ static void mpeg_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type,
     s->mcsel      = 0;
     memcpy(s->mv, mv, sizeof(*mv));
 
-    ff_init_block_index(s);
-    ff_update_block_index(s, s->avctx->bits_per_raw_sample,
-                          s->avctx->lowres, s->chroma_x_shift);
-
     s->bdsp.clear_blocks(s->block[0]);
     if (!s->chroma_y_shift)
         s->bdsp.clear_blocks(s->block[6]);



More information about the ffmpeg-cvslog mailing list