From patchwork Tue Dec 6 14:02:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Georgi D. Sotirov" X-Patchwork-Id: 1699 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp2297772vsa; Tue, 6 Dec 2016 10:07:28 -0800 (PST) X-Received: by 10.194.116.66 with SMTP id ju2mr54784270wjb.223.1481047648232; Tue, 06 Dec 2016 10:07:28 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fq2si20733238wjb.119.2016.12.06.10.07.27; Tue, 06 Dec 2016 10:07:28 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E492C689E6A; Tue, 6 Dec 2016 20:07:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from dir.bg (smtp01.dir.bg [194.145.63.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B437689E6A for ; Tue, 6 Dec 2016 16:02:45 +0200 (EET) Received: from [213.222.54.136] (account gdsotirov@dir.bg HELO [10.8.5.62]) by srv.dir.bg (CommuniGate Pro SMTP 5.2.20) with ESMTPSA id 654015870 for ffmpeg-devel@ffmpeg.org; Tue, 06 Dec 2016 16:02:55 +0200 To: ffmpeg-devel@ffmpeg.org From: "Georgi D. Sotirov" Message-ID: <88df2e02-8d12-eb2e-2800-38801f0ffa75@dir.bg> Date: Tue, 6 Dec 2016 16:02:51 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 06 Dec 2016 20:07:14 +0200 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] Update for Chromaprint 1.4 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hello FFmpeg community, In new Chromaprint 1.4 (that was released 2016-12-03) type ChromaprintContext is no longer void *, but empty structure (see commit 2132e19 [1] from 2016-06-06 in BitBucket). This breaks compilation of libavformat/chromaprint.c, because member ctx of ChromaprintMuxContext should be pointer. This simple change resolves the problem. I hope you apply the patch. [1] https://bitbucket.org/acoustid/chromaprint/commits/2132e1966f240939d1cbb757f8ac7d9cbf53c824 Best Regards, --- Georgi D. Sotirov diff --git a/libavformat/chromaprint.c b/libavformat/chromaprint.c index de73181..8c9a6c0 100644 --- a/libavformat/chromaprint.c +++ b/libavformat/chromaprint.c @@ -39,11 +39,7 @@ 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)