From patchwork Tue Aug 13 10:45:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 14483 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0C3EE448816 for ; Tue, 13 Aug 2019 13:45:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D756B689BB9; Tue, 13 Aug 2019 13:45:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com [209.85.210.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A59EA680133 for ; Tue, 13 Aug 2019 13:45:38 +0300 (EEST) Received: by mail-ot1-f51.google.com with SMTP id m24so17642382otp.12 for ; Tue, 13 Aug 2019 03:45:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=+B5jfQZ4ZAtHTwleD8uy6CkNvaqwMtkc68ARVAUQXHA=; b=mDOP2LhavpM4xb4g73CM++lvQOk72vozir6WcHaecaE6GW9yoPD43NESriroSGJvUz CcmiOko5BV/uoIcj7Et9sxkua+eMt9GG00Fop90eOrZ9UvPZDDatum+q9jCNVKlJY8rQ XWMnYxsev7O1zTvyNlB+Z0vXaty2uwlTO8HndP6vuuP9pbqPLvTdfT76j1TRIxmfBezV 6nlfuOaqjhRwHEXFjvR2uwe9YGYa1StPFgm4NQfqPj+UIHZCfOiEPnPlwepkgx0ZxW6G DGR4XyWYZTq6PKUq19d+OHdcHm9C2ZSV0ipHhkYWCbcKEoSNyFHiCFdFLyPCZpyDbsgF xhzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=+B5jfQZ4ZAtHTwleD8uy6CkNvaqwMtkc68ARVAUQXHA=; b=okUZAPGZcPpYDnua8F9psHf16nfd17RYqGeTkWpxt3NM9xgyn6DIoj6gogQ37cvTdS 867cBsCZmrXgQVAtvBI2a15aFPbowInPXvFYkdGsoqyFGD5HXis6sC28AD/7TAgMjoOe A0dnfq1aSkW0Eki1BMvZYan/3nrujExSxdK38SlGK06FvXyuDR7DysfjtDpHSzYE4Psd BSZNduAm4mbCYNg1GieWbsWKWETOd0JsHKse8get0UubQFJaF7UOvDMhLwR7NNGXxr2K 93Z+p+IvH8OjlHdVkyaeJEW2cb5t4S6rXLZF+s01wsZQovStR6WGwW6Vr/m9r0sJArla 6a3A== X-Gm-Message-State: APjAAAXks/Iq562O2JlZ5k9mfQlXVfLR6tMBocBDeUEyfosTPGeyL7nq 9wcrwkYjH1MW1sHciYbxAE3AKh5h2hRi2XyUmqNJYw== X-Google-Smtp-Source: APXvYqyrMIPr0m7JFFFTLIzu7QId9W7rka2IbyKhM12HM0u0BGKOlevHI4czKFANiGFTSyR4zCoxoSvhCihvxoPFjts= X-Received: by 2002:a6b:fb02:: with SMTP id h2mr38950791iog.289.1565693137131; Tue, 13 Aug 2019 03:45:37 -0700 (PDT) MIME-Version: 1.0 From: Carl Eugen Hoyos Date: Tue, 13 Aug 2019 12:45:25 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/chromaprint: Silence compilation warnings 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" Hi! Attached patch fixes several compilation warnings when building with chromapring. Please comment, Carl Eugen From 96eb4a33e8b256ee3ae75f3600ba26e6cd9b3bf2 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 13 Aug 2019 12:42:27 +0200 Subject: [PATCH] lavf/chromaprint: Silence compilation warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the following warnings: libavformat/chromaprint.c:117:42: warning: passing argument 2 of ‘chromaprint_feed’ from incompatible pointer type libavformat/chromaprint.c:132:52: warning: passing argument 2 of ‘chromaprint_get_raw_fingerprint’ from incompatible pointer type libavformat/chromaprint.c:143:71: warning: passing argument 4 of ‘chromaprint_encode_fingerprint’ from incompatible pointer type --- libavformat/chromaprint.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/chromaprint.c b/libavformat/chromaprint.c index f39c09ddb9..77015d9c10 100644 --- a/libavformat/chromaprint.c +++ b/libavformat/chromaprint.c @@ -114,14 +114,15 @@ fail: static int write_packet(AVFormatContext *s, AVPacket *pkt) { ChromaprintMuxContext *cpr = s->priv_data; - return chromaprint_feed(cpr->ctx, pkt->data, pkt->size / 2) ? 0 : AVERROR(EINVAL); + return chromaprint_feed(cpr->ctx, (const uint16_t *)pkt->data, pkt->size / 2) ? 0 : AVERROR(EINVAL); } static int write_trailer(AVFormatContext *s) { ChromaprintMuxContext *cpr = s->priv_data; AVIOContext *pb = s->pb; - void *fp = NULL, *enc_fp = NULL; + void *fp = NULL; + char *enc_fp = NULL; int size, enc_size, ret = AVERROR(EINVAL); if (!chromaprint_finish(cpr->ctx)) { @@ -129,7 +130,7 @@ static int write_trailer(AVFormatContext *s) goto fail; } - if (!chromaprint_get_raw_fingerprint(cpr->ctx, &fp, &size)) { + if (!chromaprint_get_raw_fingerprint(cpr->ctx, (uint32_t **)&fp, &size)) { av_log(s, AV_LOG_ERROR, "Failed to retrieve fingerprint\n"); goto fail; } -- 2.22.0