libavcodec: remove av_destruct_packet_nofree()

This function was deprecated two major versions ago (2009).

Signed-off-by: Mans Rullgard <mans@mansr.com>

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 8a091bd524b5763827a98f6ca270937ec28c95ba..d0c5e07d100ac3eb3d38a7bd5ef2b41f67c0c764 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3333,11 +3333,6 @@ void avsubtitle_free(AVSubtitle *sub);
  * @{
  */
 
-/**
- * @deprecated use NULL instead
- */
-attribute_deprecated void av_destruct_packet_nofree(AVPacket *pkt);
-
 /**
  * Default packet destructor.
  */

diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index 3344cf9f0b802ea12b4b9a18cb1100e5e89440bf..cb24948a483301ba6fa9610989beb7f0e0847e1f 100644 (file)
--- 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;