diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-11-04 09:36:59 -0500 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-11-06 10:44:46 -0500 |
| commit | 5d29efe4b0154ce305d66fed2ac23e5842439256 (patch) | |
| tree | 6416d857eab391885bda81b6372910bebfba2bfb | |
| parent | 37b3361e755361d4ff14a2973df001c0140d98d6 (diff) | |
| download | ffmpeg-5d29efe4b0154ce305d66fed2ac23e5842439256.tar.gz | |
mpeg12dec: simplify context duplication
CC: libav-stable@libav.org
Bug-Id: CID 717453 / CID 717454 / CID 717915
| -rw-r--r-- | libavcodec/mpeg12dec.c | 7 |
1 files 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++; |