From 5d29efe4b0154ce305d66fed2ac23e5842439256 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Tue, 4 Nov 2014 09:36:59 -0500 Subject: [PATCH] mpeg12dec: simplify context duplication CC: libav-stable@libav.org Bug-Id: CID 717453 / CID 717454 / CID 717915 --- libavcodec/mpeg12dec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 38daeaa954..b66bdc1dd6 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1138,8 +1138,11 @@ static int mpeg_decode_update_thread_context(AVCodecContext *avctx, if (err) return err; - if (!ctx->mpeg_enc_ctx_allocated) - memcpy(s + 1, s1 + 1, sizeof(Mpeg1Context) - sizeof(MpegEncContext)); + if (!ctx->mpeg_enc_ctx_allocated) { + // copy the whole context after the initial MpegEncContext structure + memcpy(ctx, ctx_from, sizeof(*ctx)); + memset(&ctx->mpeg_enc_ctx, 0, sizeof(ctx->mpeg_enc_ctx)); + } if (!(s->pict_type == AV_PICTURE_TYPE_B || s->low_delay)) s->picture_number++;