diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-03 23:46:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-10 04:53:00 +0200 |
| commit | 02bae9f013e73f960e9283b79d9ebf4bc81969c6 (patch) | |
| tree | 3350dfb03e3bbe18750a70e67dad1a19881aa100 | |
| parent | 5cb2a1c3f0b9e719756c7cafc32ee98ab02bd5c3 (diff) | |
| download | ffmpeg-02bae9f013e73f960e9283b79d9ebf4bc81969c6.tar.gz | |
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
| -rw-r--r-- | libavcodec/h264.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; |