From 1db641cbd2170808dc1de81e86bee1900e5dd65c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 12 Jul 2014 06:50:21 +0200 Subject: [PATCH] avcodec/hevc: more clearing to avoid stale pointers Signed-off-by: Michael Niedermayer --- libavcodec/hevc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 2cdd08a7de..cc36f97782 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2965,6 +2965,9 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) av_buffer_unref(&s->sps_list[i]); for (i = 0; i < FF_ARRAY_ELEMS(s->pps_list); i++) av_buffer_unref(&s->pps_list[i]); + s->sps = NULL; + s->pps = NULL; + s->vps = NULL; av_buffer_unref(&s->current_sps); @@ -3063,6 +3066,8 @@ static int hevc_update_thread_context(AVCodecContext *dst, } } + if (s->sps != s0->sps) + s->sps = NULL; for (i = 0; i < FF_ARRAY_ELEMS(s->vps_list); i++) { av_buffer_unref(&s->vps_list[i]); if (s0->vps_list[i]) {