summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2016-12-24 11:33:11 +0100
committerAlexis Ballier <aballier@gentoo.org>2016-12-24 11:33:25 +0100
commit3564e7dbe3136e473df37de148f2449301032c30 (patch)
treef7d34d1f728ca10ac8a86dee36c7ea5f04cf3491 /media-video/ffmpeg/files
parentmedia-video/ffmpeg: remove old (diff)
downloadgentoo-3564e7dbe3136e473df37de148f2449301032c30.tar.gz
gentoo-3564e7dbe3136e473df37de148f2449301032c30.tar.bz2
gentoo-3564e7dbe3136e473df37de148f2449301032c30.zip
media-video/ffmpeg: backport upstream patch to build with chromaprint 1.4.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'media-video/ffmpeg/files')
-rw-r--r--media-video/ffmpeg/files/chromaprint14.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/media-video/ffmpeg/files/chromaprint14.patch b/media-video/ffmpeg/files/chromaprint14.patch
new file mode 100644
index 000000000000..d166247eca76
--- /dev/null
+++ b/media-video/ffmpeg/files/chromaprint14.patch
@@ -0,0 +1,24 @@
+commit 581f93f37ef2e7a00662828ed0348d1edb9041fe
+Author: Georgi D. Sotirov <gdsotirov@dir.bg>
+Date: Tue Dec 6 21:07:59 2016 +0100
+
+ lavf/chromaprint: Update for version 1.4
+
+ Fixes ticket #5997.
+
+diff --git a/libavformat/chromaprint.c b/libavformat/chromaprint.c
+index 8c9a6c0111..4da02bef76 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)