Commit 80d403fc authored by Reimar Döffinger's avatar Reimar Döffinger
Browse files

Get rid of av_destruct_packet_nofree and use NULL instead.

It is still used in comparisons to keep ABI compatibility.

Originally committed as revision 18431 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e161e007
...@@ -2630,7 +2630,10 @@ typedef struct AVSubtitle { ...@@ -2630,7 +2630,10 @@ typedef struct AVSubtitle {
/* packet functions */ /* packet functions */
void av_destruct_packet_nofree(AVPacket *pkt); /**
* @deprecated use NULL instead
*/
attribute_deprecated void av_destruct_packet_nofree(AVPacket *pkt);
/** /**
* Default packet destructor. * Default packet destructor.
...@@ -2675,8 +2678,9 @@ int av_dup_packet(AVPacket *pkt); ...@@ -2675,8 +2678,9 @@ int av_dup_packet(AVPacket *pkt);
*/ */
static inline void av_free_packet(AVPacket *pkt) static inline void av_free_packet(AVPacket *pkt)
{ {
if (pkt && pkt->destruct) { if (pkt) {
pkt->destruct(pkt); if (pkt->destruct) pkt->destruct(pkt);
pkt->data = NULL; pkt->size = 0;
} }
} }
......
...@@ -42,7 +42,7 @@ void av_init_packet(AVPacket *pkt) ...@@ -42,7 +42,7 @@ void av_init_packet(AVPacket *pkt)
pkt->convergence_duration = 0; pkt->convergence_duration = 0;
pkt->flags = 0; pkt->flags = 0;
pkt->stream_index = 0; pkt->stream_index = 0;
pkt->destruct= av_destruct_packet_nofree; pkt->destruct= NULL;
} }
int av_new_packet(AVPacket *pkt, int size) int av_new_packet(AVPacket *pkt, int size)
......
...@@ -923,7 +923,7 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt) ...@@ -923,7 +923,7 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
pkt->pts = st->parser->pts; pkt->pts = st->parser->pts;
pkt->dts = st->parser->dts; pkt->dts = st->parser->dts;
pkt->pos = st->parser->pos; pkt->pos = st->parser->pos;
pkt->destruct = av_destruct_packet_nofree; pkt->destruct = NULL;
compute_pkt_fields(s, st, st->parser, pkt); compute_pkt_fields(s, st, st->parser, pkt);
if((s->iformat->flags & AVFMT_GENERIC_INDEX) && pkt->flags & PKT_FLAG_KEY){ if((s->iformat->flags & AVFMT_GENERIC_INDEX) && pkt->flags & PKT_FLAG_KEY){
......
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