Author: kwizart Update of /cvs/free/rpms/alsa-plugins-freeworld/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv7312 Modified Files: alsa-plugins-freeworld.spec Added Files: alsa-plugins-1.0.24-backport.patch Log Message: Fix for rfbz#2011 alsa-plugins-1.0.24-backport.patch: pcm_a52.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) --- NEW FILE alsa-plugins-1.0.24-backport.patch --- X-Git-Url: http://git.alsa-project.org/?p=alsa-plugins.git;a=blobdiff_plain;f=a52%2F... diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c index ed491b3..00c7c59 100644 --- a/a52/pcm_a52.c +++ b/a52/pcm_a52.c @@ -436,6 +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; +#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: @@ -699,8 +704,13 @@ SND_PCM_PLUGIN_DEFINE_FUNC(a52) avcodec_init(); avcodec_register_all(); - rec->codec = avcodec_find_encoder(CODEC_ID_AC3); - if (! rec->codec) { + + rec->codec = avcodec_find_encoder_by_name("ac3_fixed"); + if (rec->codec == NULL) + rec->codec = avcodec_find_encoder_by_name("ac3"); + if (rec->codec == NULL) + rec->codec = avcodec_find_encoder(CODEC_ID_AC3); + if (rec->codec == NULL) { SNDERR("Cannot find codec engine"); err = -EINVAL; goto error; Index: alsa-plugins-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/alsa-plugins-freeworld/devel/alsa-plugins-freeworld.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- alsa-plugins-freeworld.spec 23 Sep 2011 14:11:33 -0000 1.6 +++ alsa-plugins-freeworld.spec 2 Nov 2011 19:51:58 -0000 1.7 @@ -1,6 +1,6 @@ Name: alsa-plugins-freeworld Version: 1.0.24 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The ALSA Plugins - freeworld version # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+ License: LGPLv2+ @@ -9,6 +9,7 @@ Source0: ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-%{version}.tar.bz2 Source1: a52.conf Source2: lavcrate.conf +Patch0: alsa-plugins-1.0.24-backport.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel >= 1.0.24 @@ -46,6 +47,7 @@ %prep %setup -q -n alsa-plugins-%{version}%{?prever} +%patch0 -p1 %build export CPPFLAGS="$(pkg-config --cflags libavcodec)" @@ -105,6 +107,9 @@ %changelog +* Wed Nov 02 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0.24-3 +- Fix transition to FFmpeg-0.8 - rfbz#2011 + * Fri Sep 23 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0.24-2 - Rebuild for FFmpeg