[FFmpeg-cvslog] avcodec/h264: clear cur_pic structure instead of duplicating it in ff_h264_update_thread_context ()
Michael Niedermayer
git at videolan.org
Thu Apr 10 05:08:40 CEST 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 3 23:46:25 2014 +0200| [02bae9f013e73f960e9283b79d9ebf4bc81969c6] | committer: Michael Niedermayer
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 at gmx.at>
(cherry picked from commit 8710ee11d75eebc17e7d63bc6ffb91766933bd68)
Conflicts:
libavcodec/h264_slice.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=02bae9f013e73f960e9283b79d9ebf4bc81969c6
---
libavcodec/h264.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index ec3601f..1a6a259 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;
More information about the ffmpeg-cvslog
mailing list