From ce70f28a1732c74a9cd7fec2d56178750bd6e457 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Fri, 23 Oct 2015 11:11:31 +0200 Subject: avpacket: Replace av_free_packet with av_packet_unref `av_packet_unref` matches the AVFrame ref-counted API and can be used as a drop in replacement. Deprecate `av_free_packet`. --- libavformat/asfdec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libavformat/asfdec.c') diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index a39f6d4c21..e1b0b8c67b 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -444,7 +444,7 @@ static int asf_read_picture(AVFormatContext *s, int len) fail: av_freep(&desc); - av_free_packet(&pkt); + av_packet_unref(&pkt); return ret; } @@ -1128,7 +1128,7 @@ static void reset_packet(ASFPacket *asf_pkt) asf_pkt->flags = 0; asf_pkt->dts = 0; asf_pkt->duration = 0; - av_free_packet(&asf_pkt->avpkt); + av_packet_unref(&asf_pkt->avpkt); av_init_packet(&asf_pkt->avpkt); } @@ -1395,7 +1395,7 @@ static int asf_deinterleave(AVFormatContext *s, ASFPacket *asf_pkt, int st_num) if (p > asf_pkt->avpkt.data + asf_pkt->data_size) break; } - av_free_packet(&asf_pkt->avpkt); + av_packet_unref(&asf_pkt->avpkt); asf_pkt->avpkt = pkt; return 0; @@ -1485,7 +1485,7 @@ static int asf_read_close(AVFormatContext *s) for (i = 0; i < ASF_MAX_STREAMS; i++) { av_dict_free(&asf->asf_sd[i].asf_met); if (i < asf->nb_streams) { - av_free_packet(&asf->asf_st[i]->pkt.avpkt); + av_packet_unref(&asf->asf_st[i]->pkt.avpkt); av_freep(&asf->asf_st[i]); } } @@ -1521,7 +1521,7 @@ static void reset_packet_state(AVFormatContext *s) pkt->flags = 0; pkt->dts = 0; pkt->duration = 0; - av_free_packet(&pkt->avpkt); + av_packet_unref(&pkt->avpkt); av_init_packet(&pkt->avpkt); } } @@ -1588,11 +1588,11 @@ static int64_t asf_read_timestamp(AVFormatContext *s, int stream_index, } if (st_found) break; - av_free_packet(&pkt); + av_packet_unref(&pkt); } *pos = pkt_pos; - av_free_packet(&pkt); + av_packet_unref(&pkt); return dts; } -- cgit v1.2.3