diff options
| -rw-r--r-- | libavcodec/avpacket.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index cb24948a48..c26fb8e35c 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; } } |