[SCM] cantata/master: Fix FTBFS with ffmpeg 2.9

[stuart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fdeb3616c97686be44fc1fc05b21a8dd62fa0887
Author: Stuart Prescott <stuart at debian.org>
Date:   Wed Nov 4 00:33:30 2015 +1100

    Fix FTBFS with ffmpeg 2.9

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 0000000..d7d31c7
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,15 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
+Last-Update: <2015-11-02>
+
+--- cantata-1.5.2.ds2.orig/replaygain/ffmpeginput.cpp
++++ cantata-1.5.2.ds2/replaygain/ffmpeginput.cpp
+@@ -21,7 +21,7 @@ extern "C" {
+ #include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+ #if LIBAVFORMAT_VERSION_MAJOR >= 54
+-#include <libavutil/audioconvert.h>
++#include <libavutil/channel_layout.h>
+ #endif
+ #ifdef __cplusplus
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 381f209..a41993a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 #playeradaptor.patch
 ebur128-location.patch
 libmusicbrainz5cc.patch
+ffmpeg_2.9.patch

-- 
cantata packaging