1. ffmpeg
  2. Commit 02bae9f013e73f960e9283b79d9ebf4bc81969c6
Browse code

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 <michaelni@gmx.at>
(cherry picked from commit 8710ee11d75eebc17e7d63bc6ffb91766933bd68)

Conflicts:

libavcodec/h264_slice.c

Michael Niedermayer authored on 2014/04/04 06:46:25
Showing 1 changed files
libavcodec/h264.c
History View file @ 02bae9f
... ... 
@@ -1813,6 +1813,7 @@ static int decode_update_thread_context(AVCodecContext *dst,
1813 1813 
         memset(&h->mb, 0, sizeof(h->mb));
1814 1814 
         memset(&h->mb_luma_dc, 0, sizeof(h->mb_luma_dc));
1815 1815 
         memset(&h->mb_padding, 0, sizeof(h->mb_padding));
1816 
+        memset(&h->cur_pic, 0, sizeof(h->cur_pic));
1816 1817
1817 1818 
         h->avctx             = dst;
1818 1819 
         h->DPB               = NULL;