From 79c1cdd973cb8abcbb95affd3fd6d8ba75e980f2 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 30 Nov 2013 03:11:56 +0100 Subject: [PATCH] mpeg4_update_thread_context: copy the whole mpeg4 specific context instead of variables one by one This simplifies the code Signed-off-by: Michael Niedermayer --- libavcodec/mpeg4videodec.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 6f93f2bda9..cc0f5054a3 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2680,14 +2680,7 @@ static int mpeg4_update_thread_context(AVCodecContext *dst, if (ret < 0) return ret; - s->shape = s1->shape; - s->time_increment_bits = s1->time_increment_bits; - s->vol_sprite_usage = s1->vol_sprite_usage; - s->rvlc = s1->rvlc; - s->divx_version = s1->divx_version; - s->divx_build = s1->divx_build; - s->xvid_build = s1->xvid_build; - s->lavc_build = s1->lavc_build; + memcpy(((uint8_t*)s) + sizeof(MpegEncContext), ((uint8_t*)s1) + sizeof(MpegEncContext), sizeof(Mpeg4DecContext) - sizeof(MpegEncContext)); return 0; }