aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264_slice.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-21 15:37:05 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-21 15:37:05 +0100
commitd86e8f235e59e1f5f49fda8eeabd69bfb8396549 (patch)
treef483b84722540cf4a08046c0de7040915603e5fd /libavcodec/h264_slice.c
parent739edc1a7e83cdca27c3defbc3f057e98a3de472 (diff)
downloadffmpeg-d86e8f235e59e1f5f49fda8eeabd69bfb8396549.tar.gz
avcodec/h264_slice: Merge 2 memcpy()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_slice.c')
-rw-r--r--libavcodec/h264_slice.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index a4aa671dd8..a421530ea1 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -534,10 +534,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst,
av_freep(&h->rbsp_buffer[0]);
av_freep(&h->rbsp_buffer[1]);
ff_h264_unref_picture(h, &h->last_pic_for_ec);
- memcpy(h, h1, offsetof(H264Context, cabac));
- memcpy(&h->cabac, &h1->cabac,
- sizeof(H264Context) - offsetof(H264Context, cabac));
-
+ memcpy(h, h1, sizeof(H264Context));
memset(h->sps_buffers, 0, sizeof(h->sps_buffers));
memset(h->pps_buffers, 0, sizeof(h->pps_buffers));