diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-08-25 11:51:57 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-09-15 13:50:35 +0100 |
| commit | cb6632809d27a0dfe2f63fea1c656bd39ce046ed (patch) | |
| tree | 68d9ed38edb420ba894e045c2ee39940b7ae0db3 | |
| parent | 1c56cdad337a39951f26b17bdc8068d75a19ffca (diff) | |
| download | ffmpeg-cb6632809d27a0dfe2f63fea1c656bd39ce046ed.tar.gz | |
libavcodec: remove av_destruct_packet_nofree()
This function was deprecated two major versions ago (2009).
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rw-r--r-- | libavcodec/avcodec.h | 5 | ||||
| -rw-r--r-- | libavcodec/avpacket.c | 11 |
2 files changed, 1 insertions, 15 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8a091bd524..d0c5e07d10 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3334,11 +3334,6 @@ void avsubtitle_free(AVSubtitle *sub); */ /** - * @deprecated use NULL instead - */ -attribute_deprecated void av_destruct_packet_nofree(AVPacket *pkt); - -/** * Default packet destructor. */ void av_destruct_packet(AVPacket *pkt); diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 3344cf9f0b..cb24948a48 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -25,14 +25,6 @@ #include "libavutil/mem.h" #include "avcodec.h" -void av_destruct_packet_nofree(AVPacket *pkt) -{ - pkt->data = NULL; - pkt->size = 0; - pkt->side_data = NULL; - pkt->side_data_elems = 0; -} - void av_destruct_packet(AVPacket *pkt) { int i; @@ -131,8 +123,7 @@ int av_dup_packet(AVPacket *pkt) { AVPacket tmp_pkt; - if (((pkt->destruct == av_destruct_packet_nofree) || - (pkt->destruct == NULL)) && pkt->data) { + if (pkt->destruct == NULL && pkt->data) { tmp_pkt = *pkt; pkt->data = NULL; |