aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-12 06:36:25 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-05 04:13:38 +0200
commita4e1532ee78db692345090c68de08d2d928274a4 (patch)
tree231c5f78d84813a70f7472253279f67699135cfc
parentf7b147548e768aa36acec9f752fcbd001d9e03c5 (diff)
downloadffmpeg-a4e1532ee78db692345090c68de08d2d928274a4.tar.gz
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 <michaelni@gmx.at> (cherry picked from commit ccd6911c189d2f974dcc4095c963dfad14d703d2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/hevc.c6
-rw-r--r--libavcodec/hevc.h2
-rw-r--r--libavcodec/hevc_parser.c3
-rw-r--r--libavcodec/hevc_ps.c4
4 files changed, 15 insertions, 0 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index eae0757c81..fd0309af60 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 a1c76fe49b..3d71871891 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 dc1f6d5a38..72844529e7 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 647f83eec6..669aba9603 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;
}