At Tue, 26 Apr 2011 23:02:41 +0100, Colin Guthrie wrote:

This fixes a regression introduced in:

commit 40c129a160f37fe9488b2828d6299f99c269703e Author: Joerg Reuter jreuter@suse.de Date: Wed Apr 6 16:36:11 2011 +0200

a52 - Fix a52 codec with recent libavcodec updates

The recent libavcodec is changed to accept only float input, but
the old ac3 encoder is still somehow working with a different name.
This patch makes it working again.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

Thanks, applied now.

Takashi

--

Colin Guthrie gmane(at)colin.guthr.ie http://colin.guthr.ie/

Day Job: Tribalogic Limited [http://www.tribalogic.net/] Open Source: Mageia Contributor [http://www.mageia.org/] PulseAudio Hacker [http://www.pulseaudio.org/] Trac Hacker [http://trac.edgewall.org/] [2 0001-a52-Fix-build-with-older-ffmpeg-versions.patch <text/x-patch (7bit)>]

...

From 7d0fcca85d58fa38d595ab4362cf2db689db1c1c Mon Sep 17 00:00:00 2001

From: Colin Guthrie colin@mageia.org Date: Tue, 26 Apr 2011 22:55:44 +0100 Subject: [PATCH] a52: Fix build with older ffmpeg versions.

This fixes a regression introduced in: 40c129a160f37fe9488b2828d6299f99c269703e

---

a52/pcm_a52.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c index 76f21cd..00c7c59 100644 --- a/a52/pcm_a52.c +++ b/a52/pcm_a52.c @@ -436,7 +436,11 @@ static int a52_prepare(snd_pcm_ioplug_t *io) rec->avctx->bit_rate = rec->bitrate * 1000; rec->avctx->sample_rate = io->rate; rec->avctx->channels = io->channels;

• rec->avctx->sample_fmt = AV_SAMPLE_FMT_S16;

+#if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 95)

• rec->avctx->sample_fmt = AV_SAMPLE_FMT_S16;

+#else

• rec->avctx->sample_fmt = SAMPLE_FMT_S16;

+#endif #if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) switch (io->channels) { case 2: -- 1.7.4.4

[3 <text/plain; us-ascii (7bit)>] _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel