diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2015-10-23 11:11:31 +0200 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2015-10-26 18:00:55 +0100 |
commit | ce70f28a1732c74a9cd7fec2d56178750bd6e457 (patch) | |
tree | 4e23c0b8181685ce4901250c8ee8468955bc362a /libavformat/wvdec.c | |
parent | a5d42043093a39636a1f4021a37dd9c612479f6f (diff) | |
download | ffmpeg-ce70f28a1732c74a9cd7fec2d56178750bd6e457.tar.gz |
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`.
Diffstat (limited to 'libavformat/wvdec.c')
-rw-r--r-- | libavformat/wvdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/wvdec.c b/libavformat/wvdec.c index 75eddd2f50..e9a2a6227e 100644 --- a/libavformat/wvdec.c +++ b/libavformat/wvdec.c @@ -269,25 +269,25 @@ static int wv_read_packet(AVFormatContext *s, AVPacket *pkt) memcpy(pkt->data, wc->block_header, WV_HEADER_SIZE); ret = avio_read(s->pb, pkt->data + WV_HEADER_SIZE, wc->header.blocksize); if (ret != wc->header.blocksize) { - av_free_packet(pkt); + av_packet_unref(pkt); return AVERROR(EIO); } while (!(wc->header.flags & WV_FLAG_FINAL_BLOCK)) { if ((ret = wv_read_block_header(s, s->pb)) < 0) { - av_free_packet(pkt); + av_packet_unref(pkt); return ret; } off = pkt->size; if ((ret = av_grow_packet(pkt, WV_HEADER_SIZE + wc->header.blocksize)) < 0) { - av_free_packet(pkt); + av_packet_unref(pkt); return ret; } memcpy(pkt->data + off, wc->block_header, WV_HEADER_SIZE); ret = avio_read(s->pb, pkt->data + off + WV_HEADER_SIZE, wc->header.blocksize); if (ret != wc->header.blocksize) { - av_free_packet(pkt); + av_packet_unref(pkt); return (ret < 0) ? ret : AVERROR_EOF; } } @@ -334,7 +334,7 @@ static int wv_read_seek(AVFormatContext *s, int stream_index, return ret; } pts = pkt->pts; - av_free_packet(pkt); + av_packet_unref(pkt); } while(pts < timestamp); return 0; } |