[FFmpeg-cvslog] avcodec/h264_slice: Merge 2 memcpy()

Michael Niedermayer git at videolan.org
Sat Mar 21 15:44:21 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 15:37:05 2015 +0100| [d86e8f235e59e1f5f49fda8eeabd69bfb8396549] | committer: Michael Niedermayer

avcodec/h264_slice: Merge 2 memcpy()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d86e8f235e59e1f5f49fda8eeabd69bfb8396549
---

 libavcodec/h264_slice.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index a4aa671..a421530 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));



More information about the ffmpeg-cvslog mailing list