summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-10-28 23:48:56 +0100
committerwm4 <wm4@nowhere>2015-10-28 23:48:56 +0100
commit3c081dfd938181dcd0c7dfedbbc3db460d757e38 (patch)
treea07bac72b94ad7d65d76f37971afcef052667234 /demux
parenta135c9cffc0be4dd980f41e424d88821ea1222c1 (diff)
downloadmpv-3c081dfd938181dcd0c7dfedbbc3db460d757e38.tar.bz2
mpv-3c081dfd938181dcd0c7dfedbbc3db460d757e38.tar.xz
Replace deprecated av_free_packet() calls
av_free_packet() got finally deprecated. Use av_packet_unref() instead, which has almost the same semantics, has existed for a while, and is available in all FFmpeg and Libav versions we support.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux_lavf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index fbe4290758..eeed7a1b9a 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -853,7 +853,7 @@ static int demux_lavf_fill_buffer(demuxer_t *demux)
AVPacket *pkt = &(AVPacket){0};
int r = av_read_frame(priv->avfc, pkt);
if (r < 0) {
- av_free_packet(pkt);
+ av_packet_unref(pkt);
if (r == AVERROR(EAGAIN))
return 1;
if (r == AVERROR_EOF)
@@ -870,13 +870,13 @@ static int demux_lavf_fill_buffer(demuxer_t *demux)
AVStream *st = priv->avfc->streams[pkt->stream_index];
if (!demux_stream_is_selected(stream)) {
- av_free_packet(pkt);
+ av_packet_unref(pkt);
return 1; // don't signal EOF if skipping a packet
}
struct demux_packet *dp = new_demux_packet_from_avpacket(pkt);
if (!dp) {
- av_free_packet(pkt);
+ av_packet_unref(pkt);
return 1;
}
@@ -896,7 +896,7 @@ static int demux_lavf_fill_buffer(demuxer_t *demux)
} else if (dp->dts != MP_NOPTS_VALUE) {
priv->last_pts = dp->dts * AV_TIME_BASE;
}
- av_free_packet(pkt);
+ av_packet_unref(pkt);
if (priv->format_hack.clear_filepos)
dp->pos = -1;