aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/alsa_dec.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-10-27 14:28:56 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2015-10-27 14:28:56 +0100
commit7f5af80ba42bbd82da53dfd95236e9d47159a96a (patch)
treef85abbee087fa12065f02278c710ea4830c2cae5 /libavdevice/alsa_dec.c
parent856b19d5935b544e96156f8e75e23b28c0a9f318 (diff)
parentce70f28a1732c74a9cd7fec2d56178750bd6e457 (diff)
downloadffmpeg-7f5af80ba42bbd82da53dfd95236e9d47159a96a.tar.gz
Merge commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457'
* commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457': avpacket: Replace av_free_packet with av_packet_unref Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavdevice/alsa_dec.c')
-rw-r--r--libavdevice/alsa_dec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/alsa_dec.c b/libavdevice/alsa_dec.c
index b8e957a5e2..71a6ef4f4e 100644
--- a/libavdevice/alsa_dec.c
+++ b/libavdevice/alsa_dec.c
@@ -111,14 +111,14 @@ static int audio_read_packet(AVFormatContext *s1, AVPacket *pkt)
while ((res = snd_pcm_readi(s->h, pkt->data, s->period_size)) < 0) {
if (res == -EAGAIN) {
- av_free_packet(pkt);
+ av_packet_unref(pkt);
return AVERROR(EAGAIN);
}
if (ff_alsa_xrun_recover(s1, res) < 0) {
av_log(s1, AV_LOG_ERROR, "ALSA read error: %s\n",
snd_strerror(res));
- av_free_packet(pkt);
+ av_packet_unref(pkt);
return AVERROR(EIO);
}