diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 03:11:56 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 03:12:41 +0100 |
commit | 79c1cdd973cb8abcbb95affd3fd6d8ba75e980f2 (patch) | |
tree | 77dcbd2ceed38c49d2eafe0c503e54be7b3fbfff /libavcodec | |
parent | 3e5cd34cd01f889a841ae850bf7776b9e33082e9 (diff) | |
download | ffmpeg-streaming-79c1cdd973cb8abcbb95affd3fd6d8ba75e980f2.zip ffmpeg-streaming-79c1cdd973cb8abcbb95affd3fd6d8ba75e980f2.tar.gz |
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 <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/mpeg4videodec.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 6f93f2b..cc0f505 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; } |