From: Anton Khirnov Date: Sun, 29 Mar 2015 10:26:45 +0000 (+0200) Subject: h264: reset the private data in init_thread_copy() X-Git-Tag: n2.7~19^2~271 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=bd737b5178f361a9b592691848f29a7a79603a7e h264: reset the private data in init_thread_copy() The generic code copies the main context's private data to all the others. However that is quite dangerous, as it might end up copying some pointers that are or will become invalid. Since everything we actually need will be copied later in update_thread_context(), it's safest to zero the private data in init_thread_copy(), so it works the same way as init for the main context. --- diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 0b963e4106..46c172ad48 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -677,8 +677,8 @@ static int decode_init_thread_copy(AVCodecContext *avctx) if (!avctx->internal->is_copy) return 0; - memset(h->sps_buffers, 0, sizeof(h->sps_buffers)); - memset(h->pps_buffers, 0, sizeof(h->pps_buffers)); + + memset(h, 0, sizeof(*h)); ret = h264_init_context(avctx, h); if (ret < 0)