From patchwork Tue Aug 25 14:09:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21925 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 5D67244A992 for ; Tue, 25 Aug 2020 17:34:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 36F7E68827C; Tue, 25 Aug 2020 17:34:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD5C66880C1 for ; Tue, 25 Aug 2020 17:34:45 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id q14so1829289wrn.9 for ; Tue, 25 Aug 2020 07:34:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uzrk9Hgvx/DPjLdpRpHMlNM+qFt0Bvnuj2jARq5t74E=; b=o7c67EZPu8nNwiTp6X4VMX/ZxpuTvz47BkMlbuaUhAHeaFKooo+HE3pR69X8nlVq66 wk5vXMCbjW/3syVDYgLaKDt4z4Ac3/SrPomYTPe6bJtg1zu/lP4r4w4/X6PBc+FONERx 0euKXlRxg4ffeOuTPjgrMLwbA5Lso8aLMyod0OzkPVMgLe1Xs1+l74YK68TjTKtsUWvM hJeAixONAbnBYF9wmbWXXQz21hDlZRiPBexCFEytCaB9kG4CMpUqdQVHtFKGl7qWEtfk X76IiWms7okeUsW29WkQHEF/DCAqSfPs4Vs9z8r+YB+UQlm5BQ5RrXyE5xcKo8MAWReg rBgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uzrk9Hgvx/DPjLdpRpHMlNM+qFt0Bvnuj2jARq5t74E=; b=Mw9JjGYOzyOfVy/Fnsjojn1VYGG/+q5NDn3wA24jhlEQQ+NO6IhYoqC02NAH8pEJp7 +dGxhJD9gQwDGQvthXQxGm3uLTLJspTMVQcFbT4aBUse06gXlyOyYcl12iIl9WpnGSgS 8Y+QgArqFJPfuMthYrs1aBFow9PBclCpBrbBXvtLgcKsKQxfLzdlzci7xrNeD1fXo5j4 Vrtg1vuHvkk33JwsQjqEPUA4zLqwia7GHEmAI/fy5XPer2lP96OaEEkcmK722+VlIB+J qr3a0FJMY/yW3DiLWMya0KgsEc4ewcmdpZ6Ufuu9Z89bI18U29X9luv3EcVB7NCWqBYR 7x+Q== X-Gm-Message-State: AOAM530FHnL/h7DeVyP54sVyKCFPaQtTu8zlwdgt4093qCeAsRlxMW35 VUKLTXksvGDARb8eX9XAh4KkjXLjTeQ= X-Google-Smtp-Source: ABdhPJy9/pHNt53QnSQWt8WInUf7wBSNybrKeryT0lsuwx8dAuP3Hs2fKHBBPGws19VOmVIPCrfaEg== X-Received: by 2002:aa7:c6ca:: with SMTP id b10mr2239309eds.269.1598364624396; Tue, 25 Aug 2020 07:10:24 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id k25sm10169806edx.96.2020.08.25.07.10.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 07:10:23 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Aug 2020 16:09:26 +0200 Message-Id: <20200825140927.16433-18-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200825140927.16433-1-andreas.rheinhardt@gmail.com> References: <20200825140927.16433-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 18/19] avfilter/vf_signature: Allocate arrays together 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_signature.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_signature.c b/libavfilter/vf_signature.c index 32a6405e14..1ed93051b6 100644 --- a/libavfilter/vf_signature.c +++ b/libavfilter/vf_signature.c @@ -257,14 +257,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref) int64_t* elemsignature; uint64_t* sortsignature; - elemsignature = av_malloc_array(elemcat->elem_count, sizeof(int64_t)); + elemsignature = av_malloc_array(elemcat->elem_count, 2 * sizeof(int64_t)); if (!elemsignature) return AVERROR(ENOMEM); - sortsignature = av_malloc_array(elemcat->elem_count, sizeof(int64_t)); - if (!sortsignature) { - av_freep(&elemsignature); - return AVERROR(ENOMEM); - } + sortsignature = (uint64_t *)(elemsignature + elemcat->elem_count); for (j = 0; j < elemcat->elem_count; j++) { blocksum = 0; @@ -314,7 +310,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref) f++; } av_freep(&elemsignature); - av_freep(&sortsignature); } /* confidence */