Bug#517464: xmms2: diff for NMU version 0.5DrLecter-2.1

[Adeodato Simó]

Hi,

Attached is the diff for my xmms2 0.5DrLecter-2.1 NMU.

-- 
- Are you sure we're good?
- Always.
        -- Rory and Lorelai

diff -u xmms2-0.5DrLecter/debian/changelog xmms2-0.5DrLecter/debian/changelog
--- xmms2-0.5DrLecter/debian/changelog
+++ xmms2-0.5DrLecter/debian/changelog
@@ -1,3 +1,11 @@
+xmms2 (0.5DrLecter-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS due to missing includes and changed location of ffmpeg headers.
+    Patch by peter green and Cyril Brulebois. (Closes: #517464)
+
+ -- Adeodato Simó <d...@net.com.org.es>  Tue, 10 Mar 2009 15:02:58 +0000
+
 xmms2 (0.5DrLecter-2) unstable; urgency=medium
 
   * Make wma playback work with the latest libavcodec.
diff -u xmms2-0.5DrLecter/src/plugins/avcodec/avcodec.c xmms2-0.5DrLecter/src/plugins/avcodec/avcodec.c
--- xmms2-0.5DrLecter/src/plugins/avcodec/avcodec.c
+++ xmms2-0.5DrLecter/src/plugins/avcodec/avcodec.c
@@ -24,7 +24,7 @@
 #include <glib.h>
 
 #undef ABS
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 
 #define AVCODEC_BUFFER_SIZE 16384
 
@@ -173,7 +173,7 @@
 	data->codecctx->sample_rate = data->samplerate;
 	data->codecctx->channels = data->channels;
 	data->codecctx->bit_rate = data->bitrate;
-	data->codecctx->bits_per_sample = data->samplebits;
+	data->codecctx->bits_per_coded_sample = data->samplebits;
 	data->codecctx->block_align = data->block_align;
 	data->codecctx->extradata = data->extradata;
 	data->codecctx->extradata_size = data->extradata_size;
only in patch2:
unchanged:
--- xmms2-0.5DrLecter.orig/src/include/xmmsclient/xmmsclient++/helpers.h
+++ xmms2-0.5DrLecter/src/include/xmmsclient/xmmsclient++/helpers.h
@@ -32,6 +32,7 @@
 #include <string>
 #include <list>
 #include <vector>
+#include <climits>
 
 namespace Xmms
 {