rpms/alsa-plugins-freeworld/devel alsa-plugins-1.0.25-ffmpeg54.patch, NONE, 1.1 alsa-plugins-freeworld.spec, 1.10, 1.11

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/alsa-plugins-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10315/devel

Modified Files:
	alsa-plugins-freeworld.spec 
Added Files:
	alsa-plugins-1.0.25-ffmpeg54.patch 
Log Message:
Fix build with ffmpeg54


alsa-plugins-1.0.25-ffmpeg54.patch:
 pcm_a52.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE alsa-plugins-1.0.25-ffmpeg54.patch ---
diff -up alsa-plugins-1.0.25/a52/pcm_a52.c.ffmpeg54 alsa-plugins-1.0.25/a52/pcm_a52.c
--- alsa-plugins-1.0.25/a52/pcm_a52.c.ffmpeg54	2012-01-25 08:57:07.000000000 +0100
+++ alsa-plugins-1.0.25/a52/pcm_a52.c	2012-07-11 00:03:05.155570317 +0200
@@ -444,13 +444,25 @@ static int a52_prepare(snd_pcm_ioplug_t
 #if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3)
 	switch (io->channels) {
 	case 2:
+#if LIBAVCODEC_VERSION_MAJOR < 53
 		rec->avctx->channel_layout = CH_LAYOUT_STEREO;
+#else
+		rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO;
+#endif
 		break;
 	case 4:
+#if LIBAVCODEC_VERSION_MAJOR < 53
 		rec->avctx->channel_layout = CH_LAYOUT_QUAD;
+#else
+		rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD;
+#endif
 		break;
 	case 6:
+#if LIBAVCODEC_VERSION_MAJOR < 53
 		rec->avctx->channel_layout = CH_LAYOUT_5POINT1;
+#else
+		rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1;
+#endif
 		break;
 	default:
 		break;


Index: alsa-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/devel/alsa-plugins-freeworld.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- alsa-plugins-freeworld.spec	10 Jul 2012 21:43:38 -0000	1.10
+++ alsa-plugins-freeworld.spec	10 Jul 2012 22:09:11 -0000	1.11
@@ -10,6 +10,7 @@
 Source1:        a52.conf
 Source2:        lavcrate.conf
 Patch0:         alsa-plugins-1.0.25-gcc47.patch
+Patch1:         alsa-plugins-1.0.25-ffmpeg54.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel >= 1.0.24
@@ -48,6 +49,7 @@
 %prep
 %setup -q -n alsa-plugins-%{version}%{?prever}
 %patch0 -p1 -b .gcc47
+%patch1 -p1 -b .ffmpeg54
 
 %build
 export CPPFLAGS="$(pkg-config --cflags libavcodec)"