RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libavcodec: remove av_destruct_packet_nofree() 

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

Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Mans Rullgard 2012-08-25 11:51:57 +01:00
parent 1c56cdad33
commit cb6632809d
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/avcodec.h
View File

@ -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.
*/ */

11
libavcodec/avpacket.c
View File

@ -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)
{ {
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;