mpeg4_update_thread_context: copy the whole mpeg4 specific context instead of variabl...
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 02:11:56 +0000 (03:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 02:12:41 +0000 (03:12 +0100)
This simplifies the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4videodec.c

index 6f93f2b..cc0f505 100644 (file)
@@ -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;
 }