From e50684318390b5cffc68da131f7630f11814b808 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sun, 14 Aug 2022 00:06:16 +0200 Subject: [PATCH] avcodec/mpegpicture: Reset fields explicitly instead of memsetting them Improves the grepability of the code. (Furthermore, I hope that no compiler will really call memset for 28 bytes.) Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegpicture.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index 711ce35f9d..977bc65191 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -311,8 +311,6 @@ fail: */ void ff_mpeg_unref_picture(AVCodecContext *avctx, Picture *pic) { - int off = offsetof(Picture, hwaccel_priv_buf) + sizeof(pic->hwaccel_priv_buf); - pic->tf.f = pic->f; /* WM Image / Screen codecs allocate internal buffers with different * dimensions / colorspaces; ignore user-defined callbacks for these. */ @@ -328,7 +326,12 @@ void ff_mpeg_unref_picture(AVCodecContext *avctx, Picture *pic) if (pic->needs_realloc) free_picture_tables(pic); - memset((uint8_t*)pic + off, 0, sizeof(*pic) - off); + pic->hwaccel_picture_private = NULL; + pic->field_picture = 0; + pic->b_frame_score = 0; + pic->needs_realloc = 0; + pic->reference = 0; + pic->shared = 0; } int ff_update_picture_tables(Picture *dst, const Picture *src)