ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Sat Jul 12 06:36:25 2014 +0200| [a4e1532ee78db692345090c68de08d2d928274a4] | committer: Michael Niedermayer
avcodec/hevc_ps: do not loose all reference to pointers still in use Fixes leaving a pointer to unreferenced memory Fixes Ticket 3115 Signed-off-by: Michael Niedermayer <michae...@gmx.at> (cherry picked from commit ccd6911c189d2f974dcc4095c963dfad14d703d2) Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a4e1532ee78db692345090c68de08d2d928274a4 --- libavcodec/hevc.c | 6 ++++++ libavcodec/hevc.h | 2 ++ libavcodec/hevc_parser.c | 3 +++ libavcodec/hevc_ps.c | 4 ++++ 4 files changed, 15 insertions(+) diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index eae0757..fd0309a 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2818,6 +2818,8 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) for (i = 0; i < FF_ARRAY_ELEMS(s->pps_list); i++) av_buffer_unref(&s->pps_list[i]); + av_buffer_unref(&s->current_sps); + av_freep(&s->sh.entry_point_offset); av_freep(&s->sh.offset); av_freep(&s->sh.size); @@ -2939,6 +2941,10 @@ static int hevc_update_thread_context(AVCodecContext *dst, } } + if (s->current_sps && s->sps == (HEVCSPS*)s->current_sps->data) + s->sps = NULL; + av_buffer_unref(&s->current_sps); + if (s->sps != s0->sps) ret = set_sps(s, s0->sps); diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index a1c76fe..3d71871 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -776,6 +776,8 @@ typedef struct HEVCContext { AVBufferRef *sps_list[MAX_SPS_COUNT]; AVBufferRef *pps_list[MAX_PPS_COUNT]; + AVBufferRef *current_sps; + AVBufferPool *tab_mvf_pool; AVBufferPool *rpl_tab_pool; diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c index dc1f6d5..7284452 100644 --- a/libavcodec/hevc_parser.c +++ b/libavcodec/hevc_parser.c @@ -331,6 +331,9 @@ static void hevc_close(AVCodecParserContext *s) for (i = 0; i < FF_ARRAY_ELEMS(h->pps_list); i++) av_buffer_unref(&h->pps_list[i]); + av_buffer_unref(&h->current_sps); + h->sps = NULL; + for (i = 0; i < h->nals_allocated; i++) av_freep(&h->nals[i].rbsp_buffer); av_freep(&h->nals); diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 647f83e..669aba9 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -956,6 +956,10 @@ int ff_hevc_decode_nal_sps(HEVCContext *s) if (s->pps_list[i] && ((HEVCPPS*)s->pps_list[i]->data)->sps_id == sps_id) av_buffer_unref(&s->pps_list[i]); } + if (s->sps_list[sps_id] && s->sps == (HEVCSPS*)s->sps_list[sps_id]->data) { + av_buffer_unref(&s->current_sps); + s->current_sps = av_buffer_ref(s->sps_list[sps_id]); + } av_buffer_unref(&s->sps_list[sps_id]); s->sps_list[sps_id] = sps_buf; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
