[SCM] cmus/master: Add Ubuntu-specific patch to fix FTBFS with newest version of ffmpeg.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit eeccb57b9fe1f2dd7b24516047b1e45baca98727
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Jun 1 10:18:50 2011 +0200

    Add Ubuntu-specific patch to fix FTBFS with newest version of ffmpeg.

diff --git a/debian/patches/0001-fix-compile-error-for-new-versions-of-ffmpeg.patch b/debian/patches/0001-fix-compile-error-for-new-versions-of-ffmpeg.patch
new file mode 100644
index 0000000..0cb6655
--- /dev/null
+++ b/debian/patches/0001-fix-compile-error-for-new-versions-of-ffmpeg.patch
@@ -0,0 +1,28 @@
+From: Johannes Weißl jargon at molb.org
+Subject: Fix compile error for new versions of ffmpeg.
+---
+ ffmpeg.c |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- cmus.orig/ffmpeg.c
++++ cmus/ffmpeg.c
+@@ -38,6 +38,10 @@
+ # define NUM_FFMPEG_KEYS 8
+ #endif
+ 
++#if (LIBAVCODEC_VERSION_INT < ((52<<16)+(64<<8)+0))
++# define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
++#endif
++
+ #if (LIBAVCODEC_VERSION_INT < ((52<<16)+(94<<8)+1))
+ #define AV_SAMPLE_FMT_U8   SAMPLE_FMT_U8
+ #define AV_SAMPLE_FMT_S16  SAMPLE_FMT_S16
+@@ -182,7 +186,7 @@ static int ffmpeg_open(struct input_plug
+ 
+ 		for (i = 0; i < ic->nb_streams; i++) {
+ 			cc = ic->streams[i]->codec;
+-			if (cc->codec_type == CODEC_TYPE_AUDIO) {
++			if (cc->codec_type == AVMEDIA_TYPE_AUDIO) {
+ 				stream_index = i;
+ 				break;
+ 			}
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
new file mode 100644
index 0000000..e2ab660
--- /dev/null
+++ b/debian/patches/ubuntu.series
@@ -0,0 +1 @@
+0001-fix-compile-error-for-new-versions-of-ffmpeg.patch

-- 
cmus packaging