[SCM] cantata/master: Try again with ffmpeg3.0 patch

[stuart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6f571688782696b2a40007ef9232e9f8d6ddd3df
Author: Stuart Prescott <stuart at debian.org>
Date:   Mon Apr 18 23:34:51 2016 +1000

    Try again with ffmpeg3.0 patch

diff --git a/debian/patches/ffmpeg_3.0.patch b/debian/patches/ffmpeg_3.0.patch
new file mode 100644
index 0000000..3e5be80
--- /dev/null
+++ b/debian/patches/ffmpeg_3.0.patch
@@ -0,0 +1,14 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
+Last-Update: <2015-11-02>
+
+--- a/replaygain/ffmpeginput.cpp
++++ b/replaygain/ffmpeginput.cpp
+@@ -21,7 +21,6 @@
+ #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 5aaf4f3..09d493d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-# only needed for Qt in wheezy
+ffmpeg_3.0.patch
 cxxflags-hardening.patch
 ebur128-location.patch

-- 
cantata packaging