From 8229eff4b7a98ae5d85bb75f3bb072781b4a8ebe Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Mon, 21 Mar 2016 07:33:25 +0100
Subject: [PATCH] h2645_parse: add a function for uninitializing the packet
---
libavcodec/h2645_parse.c | 9 +++++++++
libavcodec/h2645_parse.h | 5 +++++
libavcodec/hevc.c | 5 +----
libavcodec/hevc_parser.c | 5 +----
4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c
index 794c9545973..0064b7d4892 100644
--- a/libavcodec/h2645_parse.c
+++ b/libavcodec/h2645_parse.c
@@ -226,3 +226,12 @@ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length,
return 0;
}
+
+void ff_h2645_packet_uninit(H2645Packet *pkt)
+{
+ int i;
+ for (i = 0; i < pkt->nals_allocated; i++)
+ av_freep(&pkt->nals[i].rbsp_buffer);
+ av_freep(&pkt->nals);
+ pkt->nals_allocated = 0;
+}
diff --git a/libavcodec/h2645_parse.h b/libavcodec/h2645_parse.h
index 4901ccfbc19..eaf7d60917b 100644
--- a/libavcodec/h2645_parse.h
+++ b/libavcodec/h2645_parse.h
@@ -61,4 +61,9 @@ int ff_h2645_extract_rbsp(const uint8_t *src, int length,
int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length,
AVCodecContext *avctx, int is_nalff, int nal_length_size);
+/**
+ * Free all the allocated memory in the packet.
+ */
+void ff_h2645_packet_uninit(H2645Packet *pkt);
+
#endif /* AVCODEC_H2645_PARSE_H */
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 69c4f26aa6e..72dea5a5894 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2798,10 +2798,7 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx)
for (i = 0; i < FF_ARRAY_ELEMS(s->ps.pps_list); i++)
av_buffer_unref(&s->ps.pps_list[i]);
- for (i = 0; i < s->pkt.nals_allocated; i++)
- av_freep(&s->pkt.nals[i].rbsp_buffer);
- av_freep(&s->pkt.nals);
- s->pkt.nals_allocated = 0;
+ ff_h2645_packet_uninit(&s->pkt);
return 0;
}
diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc_parser.c
index 20eae54e792..5c1fbc31d53 100644
--- a/libavcodec/hevc_parser.c
+++ b/libavcodec/hevc_parser.c
@@ -227,10 +227,7 @@ static void hevc_parser_close(AVCodecParserContext *s)
for (i = 0; i < FF_ARRAY_ELEMS(ctx->ps.pps_list); i++)
av_buffer_unref(&ctx->ps.pps_list[i]);
- for (i = 0; i < ctx->pkt.nals_allocated; i++)
- av_freep(&ctx->pkt.nals[i].rbsp_buffer);
- av_freep(&ctx->pkt.nals);
- ctx->pkt.nals_allocated = 0;
+ ff_h2645_packet_uninit(&ctx->pkt);
av_freep(&ctx->pc.buffer);
}
--
GitLab