rpms/alsa-plugins-freeworld/F-17 alsa-plugins-1.0.25-ffmpeg54.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 alsa-plugins-freeworld.spec, 1.8, 1.9 sources, 1.7, 1.8

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/alsa-plugins-freeworld/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28313/F-17

Modified Files:
	.cvsignore alsa-plugins-freeworld.spec sources 
Added Files:
	alsa-plugins-1.0.25-ffmpeg54.patch 
Log Message:
Update to 1.0.26


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: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/F-17/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Feb 2012 12:00:33 -0000	1.7
+++ .cvsignore	15 Sep 2012 10:17:24 -0000	1.8
@@ -1 +1 @@
-alsa-plugins-1.0.25.tar.bz2
+alsa-plugins-1.0.26.tar.bz2