[SCM] cmus/master: Drop 0001-fix-compile-error-for-new-versions-of-ffmpeg.patch, applied upstream.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6e858282183b37532877b82d8a834caaa03d1528
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jul 26 10:12:43 2011 +0200

    Drop 0001-fix-compile-error-for-new-versions-of-ffmpeg.patch, applied upstream.

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
deleted file mode 100644
index a87b9c8..0000000
--- a/debian/patches/0001-fix-compile-error-for-new-versions-of-ffmpeg.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Johannes Weißl jargon at molb.org
-Subject: Fix compile error for new versions of ffmpeg.
-Applied-Upstream: yes
----
- 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
deleted file mode 100644
index e2ab660..0000000
--- a/debian/patches/ubuntu.series
+++ /dev/null
@@ -1 +0,0 @@
-0001-fix-compile-error-for-new-versions-of-ffmpeg.patch

-- 
cmus packaging