[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/

[Alexis Ballier]

commit:     3564e7dbe3136e473df37de148f2449301032c30
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 10:33:11 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 10:33:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3564e7db

media-video/ffmpeg: backport upstream patch to build with chromaprint 1.4.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-video/ffmpeg/ffmpeg-3.2.2.ebuild       |  2 ++
 media-video/ffmpeg/files/chromaprint14.patch | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/media-video/ffmpeg/ffmpeg-3.2.2.ebuild b/media-video/ffmpeg/ffmpeg-3.2.2.ebuild
index 38429b2..9b30ce4 100644
--- a/media-video/ffmpeg/ffmpeg-3.2.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.2.2.ebuild
@@ -284,6 +284,8 @@ RESTRICT="
 
 S=${WORKDIR}/${P/_/-}
 
+PATCHES=( "${FILESDIR}/chromaprint14.patch" )
+
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libavutil/avconfig.h
 )

diff --git a/media-video/ffmpeg/files/chromaprint14.patch b/media-video/ffmpeg/files/chromaprint14.patch
new file mode 100644
index 00000000..d166247
--- /dev/null
+++ b/media-video/ffmpeg/files/chromaprint14.patch
@@ -0,0 +1,24 @@
+commit 581f93f37ef2e7a00662828ed0348d1edb9041fe
+Author: Georgi D. Sotirov <gdsotirov@×××.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)