[SCM] ffmpeg/master: Fix building with chromaprint 1.4.

[aca-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 49930f0107f5b210067128de22d066f904c9c2eb
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Sat Jan 21 22:26:45 2017 +0100

    Fix building with chromaprint 1.4.

diff --git a/debian/patches/lavf-chromaprint-Update-for-version-1.4.patch b/debian/patches/lavf-chromaprint-Update-for-version-1.4.patch
new file mode 100644
index 0000000..47cf0c0
--- /dev/null
+++ b/debian/patches/lavf-chromaprint-Update-for-version-1.4.patch
@@ -0,0 +1,25 @@
+From: "Georgi D. Sotirov" <gdsotirov at dir.bg>
+Date: Tue, 6 Dec 2016 21:07:59 +0100
+Subject: lavf/chromaprint: Update for version 1.4
+
+Fixes ticket #5997.
+---
+ libavformat/chromaprint.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libavformat/chromaprint.c b/libavformat/chromaprint.c
+index 8c9a6c01..4da02bef 100644
+--- a/libavformat/chromaprint.c
++++ b/libavformat/chromaprint.c
+@@ -39,7 +39,11 @@ typedef struct ChromaprintMuxContext {
+     int silence_threshold;
+     int algorithm;
+     FingerprintFormat fp_format;
++#if CPR_VERSION_INT >= AV_VERSION_INT(1, 4, 0)
++    ChromaprintContext *ctx;
++#else
+     ChromaprintContext ctx;
++#endif
+ } ChromaprintMuxContext;
+ 
+ static void cleanup(ChromaprintMuxContext *cpr)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3a50459
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+lavf-chromaprint-Update-for-version-1.4.patch

-- 
ffmpeg packaging