From 02bae9f013e73f960e9283b79d9ebf4bc81969c6 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 3 Apr 2014 23:46:25 +0200 Subject: [PATCH] avcodec/h264: clear cur_pic structure instead of duplicating it in ff_h264_update_thread_context() Fixes crash Found-by: iive Signed-off-by: Michael Niedermayer (cherry picked from commit 8710ee11d75eebc17e7d63bc6ffb91766933bd68) Conflicts: libavcodec/h264_slice.c --- libavcodec/h264.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index ec3601f994..1a6a259aa5 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1813,6 +1813,7 @@ static int decode_update_thread_context(AVCodecContext *dst, memset(&h->mb, 0, sizeof(h->mb)); memset(&h->mb_luma_dc, 0, sizeof(h->mb_luma_dc)); memset(&h->mb_padding, 0, sizeof(h->mb_padding)); + memset(&h->cur_pic, 0, sizeof(h->cur_pic)); h->avctx = dst; h->DPB = NULL;