Freeing it in av_destruct_packet(), as is done currently, would mean
that we allow it to be allocated with other means. But that would make
av_packet_new_side_data() unsafe.
Side data is not expected to be large, so copying it if required
shouldn't be a problem.
---
libavcodec/avpacket.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index cb24948..c26fb8e 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -27,16 +27,9 @@
void av_destruct_packet(AVPacket *pkt)
{
- int i;
-
av_free(pkt->data);
pkt->data = NULL;
pkt->size = 0;
-
- for (i = 0; i < pkt->side_data_elems; i++)
- av_free(pkt->side_data[i].data);
- av_freep(&pkt->side_data);
- pkt->side_data_elems = 0;
}
void av_init_packet(AVPacket *pkt)
@@ -153,11 +146,16 @@ failed_alloc:
void av_free_packet(AVPacket *pkt)
{
if (pkt) {
+ int i;
+
if (pkt->destruct)
pkt->destruct(pkt);
pkt->data = NULL;
pkt->size = 0;
- pkt->side_data = NULL;
+
+ for (i = 0; i < pkt->side_data_elems; i++)
+ av_free(pkt->side_data[i].data);
+ av_freep(&pkt->side_data);
pkt->side_data_elems = 0;
}
}
--
1.7.10.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
