rpms/xmms2-freeworld/devel xmms2-ffmpeg.patch, NONE, 1.1 xmms2-freeworld.spec, 1.5, 1.6

[Orcan Ogetbil]

Author: oget

Update of /cvs/free/rpms/xmms2-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29740

Modified Files:
	xmms2-freeworld.spec 
Added Files:
	xmms2-ffmpeg.patch 
Log Message:
* Wed Oct 05 2011 John Doe <anonymous at american.us> 0.7-3
- Patch for new ffmpeg thanks to rathann!


xmms2-ffmpeg.patch:
 avcodec.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)

--- NEW FILE xmms2-ffmpeg.patch ---
diff -up xmms2-0.7DrNo/src/plugins/avcodec/avcodec.c.ffmpeg xmms2-0.7DrNo/src/plugins/avcodec/avcodec.c
--- xmms2-0.7DrNo/src/plugins/avcodec/avcodec.c.ffmpeg	2010-02-19 18:43:54.000000000 +0100
+++ xmms2-0.7DrNo/src/plugins/avcodec/avcodec.c	2011-08-27 18:04:03.000000000 +0200
@@ -160,7 +160,11 @@ xmms_avcodec_init (xmms_xform_t *xform)
 		goto err;
 	}
 
+#if LIBAVCODEC_VERSION_MAJOR < 53
 	if (codec->type != CODEC_TYPE_AUDIO) {
+#else
+	if (codec->type != AVMEDIA_TYPE_AUDIO) {
+#endif
 		XMMS_DBG ("Codec '%s' found but its type is not audio", data->codec_id);
 		goto err;
 	}
@@ -332,9 +336,18 @@ xmms_avcodec_read (xmms_xform_t *xform, 
 		}
 
 		outbufsize = sizeof (outbuf);
+#if FF_API_AUDIO_OLD
 		bytes_read = avcodec_decode_audio2 (data->codecctx, (short *) outbuf,
 		                                    &outbufsize, data->buffer_pos,
 		                                    data->buffer_length);
+#else
+		AVPacket avpkt;
+		av_init_packet(&avpkt);
+		avpkt.data = (uint8_t *) data->buffer_pos;
+		avpkt.size = data->buffer_length;
+		bytes_read = avcodec_decode_audio3 (data->codecctx, outbuf,
+		                                    &outbufsize, &avpkt);
+#endif
 
 		if (bytes_read < 0 || bytes_read > data->buffer_length) {
 			XMMS_DBG ("Error decoding data!");


Index: xmms2-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xmms2-freeworld/devel/xmms2-freeworld.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmms2-freeworld.spec	26 Sep 2011 21:33:49 -0000	1.5
+++ xmms2-freeworld.spec	6 Oct 2011 04:33:03 -0000	1.6
@@ -3,7 +3,7 @@
 Name:			xmms2-freeworld
 Summary:		Plugins for XMMS2 that cannot be included in Fedora
 Version:		0.7
-Release:		2%{?dist}
+Release:		3%{?dist}
 License:		LGPLv2+ and GPL+ and BSD
 Group:			Applications/Multimedia
 # Fedora's xmms2 has to use a sanitized tarball, we don't.
@@ -15,6 +15,8 @@
 Patch4:			xmms2-0.7DrNo-no-O0.patch
 # More sane versioning
 Patch5:			xmms2-0.7DrNo-moresaneversioning.patch
+# Compatibility with newer ffmpeg
+Patch6:			xmms2-ffmpeg.patch
 
 URL:			http://wiki.xmms2.xmms.se/
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -98,7 +100,7 @@
 
 %patch4 -p1 -b .noO0
 %patch5 -p1 -b .versionsanity
-
+%patch6 -p1 -b .ffmpeg
 
 # Clean up paths in wafadmin
 WAFADMIN_FILES=`find wafadmin/ -type f`
@@ -216,6 +218,9 @@
 %{_libdir}/xmms2/libxmms_mp4.so
 
 %changelog
+* Wed Oct 05 2011 John Doe <anonymous at american.us> 0.7-3
+- Patch for new ffmpeg thanks to rathann!
+
 * Mon Sep 26 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.7-2
 - Rebuilt for FFmpeg-0.8