Commit cb663280 authored by Mans Rullgard's avatar Mans Rullgard

libavcodec: remove av_destruct_packet_nofree()

This function was deprecated two major versions ago (2009).
Signed-off-by: 's avatarMans Rullgard <mans@mansr.com>
parent 1c56cdad
...@@ -3333,11 +3333,6 @@ void avsubtitle_free(AVSubtitle *sub); ...@@ -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. * Default packet destructor.
*/ */
......
...@@ -25,14 +25,6 @@ ...@@ -25,14 +25,6 @@
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "avcodec.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) void av_destruct_packet(AVPacket *pkt)
{ {
int i; int i;
...@@ -131,8 +123,7 @@ int av_dup_packet(AVPacket *pkt) ...@@ -131,8 +123,7 @@ int av_dup_packet(AVPacket *pkt)
{ {
AVPacket tmp_pkt; AVPacket tmp_pkt;
if (((pkt->destruct == av_destruct_packet_nofree) || if (pkt->destruct == NULL && pkt->data) {
(pkt->destruct == NULL)) && pkt->data) {
tmp_pkt = *pkt; tmp_pkt = *pkt;
pkt->data = NULL; pkt->data = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment