From: Daniel Kirchner <daniel@ekpyron.org>
To: alsa-devel@alsa-project.org
Subject: alsa-plugins: pcm_a52.c uses recently removed avcodec_{alloc, free}_frame
Date: Wed, 9 Mar 2016 09:18:11 +0100 [thread overview]
Message-ID: <20160309091811.580705f2@ekpyrosis> (raw)
pcm_a52.c uses avcodec_alloc_frame and avcodec_free_frame that have
been replaced by av_frame_alloc and av_frame_free in recent versions of
libavcodec. The following patch should fix this while remaining
backwards compatible.
--- a/a52/pcm_a52.c.orig 2016-03-04 18:21:12.606805770 +0100
+++ b/a52/pcm_a52.c 2016-03-04 18:34:22.653240501 +0100
@@ -62,6 +62,11 @@
#define AV_CODEC_ID_AC3 CODEC_ID_AC3
#endif
+#if LIBAVCODEC_VERSION_INT < 0x371c01
+#define av_frame_alloc avcodec_alloc_frame
+#define av_frame_free avcodec_free_frame
+#endif
+
struct a52_ctx {
snd_pcm_ioplug_t io;
snd_pcm_t *slave;
@@ -513,7 +518,7 @@
rec->inbuf = NULL;
}
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0)
- avcodec_free_frame(&rec->frame);
+ av_frame_free(&rec->frame);
#else
av_freep(&rec->frame);
#endif
@@ -557,7 +562,7 @@
{
struct a52_ctx *rec = io->private_data;
#ifdef USE_AVCODEC_FRAME
- rec->frame = avcodec_alloc_frame();
+ rec->frame = av_frame_alloc();
if (!rec->frame)
return -ENOMEM;
if (av_samples_alloc(rec->frame->data, rec->frame->linesize,
next reply other threads:[~2016-03-09 8:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-09 8:18 Daniel Kirchner [this message]
2016-03-09 8:20 ` alsa-plugins: pcm_a52.c uses recently removed avcodec_{alloc, free}_frame Takashi Iwai
-- strict thread matches above, loose matches on Subject: below --
2016-03-09 7:20 Daniel Kirchner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160309091811.580705f2@ekpyrosis \
--to=daniel@ekpyron.org \
--cc=alsa-devel@alsa-project.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).