From patchwork Sun Aug 22 00:44:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29713 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp651623ybj; Sat, 21 Aug 2021 17:45:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBeO1XY6t/GOLoRMkdc/7Zo0OlK08p3c3DUU0OZpXMJ8vc3xqeGOxlqx4tJEZkF4DMAkiX X-Received: by 2002:a05:6402:1c1d:: with SMTP id ck29mr29879881edb.39.1629593136540; Sat, 21 Aug 2021 17:45:36 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id my9si11063955ejc.686.2021.08.21.17.45.35; Sat, 21 Aug 2021 17:45:36 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=k4hxG8Mz; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BC39A68A26E; Sun, 22 Aug 2021 03:45:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (unknown [40.92.89.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E49A687F4E for ; Sun, 22 Aug 2021 03:45:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vq85jP0ekPUxBRt/z+s7PqgGf12n9aVlNKNRCVGRi6mBv52XQsOgSoN0JsxvR9gtVJ7u/I5fwPR5NVLg/hQumXQv9Q2BP/Agrwm9adsct9t6Qkmly1ySwMVTbe6tyxXPH9KBiuKi4jfgLyng+cE9YS65j78N0PDVeSDultNseVV624jDX8TPJyK/HF2dvqnNMgChINAB6mIwl9uqYohMmW1KYlLiWYPvp/bO937GazTipF10nWNjQurE0XOmhULLafp+JFrjJXtZNhvf6N8Za5Is1Wocy1f93afG7z6iLbe4BSfG4nCc7iNX302Yx+MCn4BLX21AQAwKQjpvvi8+pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z/ti8g/IiPJLlsdHw72UE7740e1fgPh99Ieqm3he+kM=; b=HGJmUPaXD/dXmx8Jpr+GNOeEH+JoNJrPs1fTxD+iuibzpTQ5PQZvXkgfcj7JiE9HwP/OiMk0ab2a30HDgJZ/NSYBhLvIIQ5NPDkPnxgo9GPQul06TIfqCq3fBzBpjT4099P2TnpKYFCyIOHwJMBnaDaisRhpwxPi6YmFNxnPDyeqTnQ2IUmjYDg3a6ml74q+bYuSWcTOdNwsEdgPjEDQTwxA10LfgunRMw3fTnw8DmpLYtnAaw1D+HFsB5xqC7o+uXizORekz0VGPGXhh2r36lWENbLBf5xScmFWTushVL1VMumvNHNzaJvE3tmNP9Mur/+ZMojxErNBQyJXihq2eQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z/ti8g/IiPJLlsdHw72UE7740e1fgPh99Ieqm3he+kM=; b=k4hxG8Mz6Xj80DoREbKGvgyY0eoyf+NlUWtgDXNn6StSQArN3oo68FfcMmb8MFA1fEIZmjc8uc9mjqwl38H1cSo0E+It3xUZS3KeToFliR8D+ABLLslTiHJJtAPJkt15osVgMJ7Ez01acbXa8NzkBIDpfogAZ7jyNA+PM9zwweHZbOeTS2PiNdAeHVapq7FiT2hk/FqR6aLwADVKZRJK6yyDnzBKJBu8E8ugJ9FPbBwe+rQQ7wEqoSfy1/fzBSN6ZGez5sMMuXHoKhdK2gCQOe2Ov+BBigbPnW6OQujNc9JUuchG9u3l2EY0qZK/09T/oFRCBFNODWieDxjSam7fzQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6681.eurprd03.prod.outlook.com (2603:10a6:102:78::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.22; Sun, 22 Aug 2021 00:45:21 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:45:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:44:44 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [cwlE1tpR6YJsxhYxFF244548mNaAIg0l] X-ClientProxiedBy: AM9P192CA0027.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:21d::32) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004508.1341492-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM9P192CA0027.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:21d::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:45:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 82b6cb05-9e15-4677-d8c2-08d965061eaf X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze2ai8a8P/zXO8Tu8LFZEq5y7f+6PWwpitNuFDol35SZcpIzOEjfFhem+cI04MBcqX/Rttbnz1SNPLf+uQw+rH/89FA5mpPdGYKOi+MoF6iwgiPhjcdDwQf0x2g9afn3w621qTOrBe6LVfYy1yeh49BnuqvTbFpfZa0kuX7rTpjJdkZGz6dC3YGSMs2SlcxXBtkrU+BeHV3ocfwR4JoQ5MvIxCXLNEZoKz+PUrHx0vbUyn7zPDTT9+L0ZJXgFgXktd49Rtg3qpPRXhovyYSGa6ERSlpkEGxtKBi6eK+enJZcMgSvMcVqruXIgoTn8iDfImGhgEY88la5Or9Y64jjUN3TLHWNkV+rGoeTgwVPz9q4LabbykWjvHPTiBxP2rllk2a5wfwIcTO1BtWCYm12W27dcgZ33K0Ul1Yfe2kR3LJ1TpQt4dviOCbcCrzjUrLr+FTY2XATFytew6chg5qAJJmkrXhhmVpg8wN0wBOmBTESLByHXUwDpdt2wKCYaBP00HC8BJMeH1BPXznRLb16boCDdMBDUpCD5HxG3O5MP1M2VHObr47hhGSTwer5tsTshIkE8mhB4BOI5a7hvDFvlOO5Gd7QzTXrG3zVnnXHaiAo1KpdeWzfMkz4Sx+SY93zqoiWVmQ5ekELJpNmIu5E3sg9AdIRnuOTgtbBxrNwhnThgvYLlPARrq+URMiqMzbq87kLPAKbaMlsLjSeKR7ewa/4oE8+j7c6kJFPnf/IN4pJElOz/3WrtlHA= X-MS-TrafficTypeDiagnostic: PR3PR03MB6681: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lBbH6iZ2WBxpXalqqsHeMJE27MTqf+vX5dEhyqg5Sn0m+/zDNU0Mtws1Ufgz05vk7ublVukEGXSl60sDNdDsqHEhRV8NpnV32rjXnxq8LkxbqZ4m7CvU1PcC1XRKD1pIrY810fhm9899rcK5A5EMIPJMwFmzTWjEln16hurGAj36qgBoN7AygdXd68xDomDpozcPBRlM3/xarNNyv7iPd1Pg7CzE6AabHU0L0QiajBlDtwrciirqeplVQeJPaMsE26R3PDMtD+50KzrL6o3FEFvfWW2fXrqqY3PzhXHKBCbugyt+vuEqQ5IcmiOywAIIBoMMHP1ktoVxDEcnb/PW6QwR+MbxdYSdxSJNtPS70gtUuypLaKeyjYAdRkFbq6WPtDpFy+qW5fLEYU2lL4cixfgxd1K5bn6xb+VIzBlQUA0LmjJf3q8zULMg91COZync X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DW6o/zVqKh99hjOBMNv+vTF95nw78i3ZhSTlL47mYPRh9Cgm8FGEx24od29MZR7uiBuNTwXvQSsawEUVqJa/z/YPaITwfi3hz/eOIDXjoPW3VmBOYUmFG5EkmQR3rg54kY7csqPZ311lOg3wXV1GOA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82b6cb05-9e15-4677-d8c2-08d965061eaf X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:45:21.2479 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR03MB6681 Subject: [FFmpeg-devel] [PATCH v3 01/25] avfilter/internal: Uninline ff_insert_(in|out)pad() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: qiaB69ts5a0r Content-Length: 3569 These functions are not hot at all. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 24 +++++++++++++++++++++--- libavfilter/internal.h | 29 +++-------------------------- 2 files changed, 24 insertions(+), 29 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 28123655d6..2681d04fc0 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -101,9 +101,17 @@ void ff_command_queue_pop(AVFilterContext *filter) av_free(c); } -int ff_append_pad(unsigned *count, - AVFilterPad **pads, AVFilterLink ***links, - AVFilterPad *newpad) +/** + * Append a new pad. + * + * @param count Pointer to the number of pads in the list + * @param pads Pointer to the pointer to the beginning of the list of pads + * @param links Pointer to the pointer to the beginning of the list of links + * @param newpad The new pad to add. A copy is made when adding. + * @return >= 0 in case of success, a negative AVERROR code on error + */ +static int append_pad(unsigned *count, AVFilterPad **pads, + AVFilterLink ***links, AVFilterPad *newpad) { AVFilterLink **newlinks; AVFilterPad *newpads; @@ -126,6 +134,16 @@ int ff_append_pad(unsigned *count, return 0; } +int ff_append_inpad(AVFilterContext *f, AVFilterPad *p) +{ + return append_pad(&f->nb_inputs, &f->input_pads, &f->inputs, p); +} + +int ff_append_outpad(AVFilterContext *f, AVFilterPad *p) +{ + return append_pad(&f->nb_outputs, &f->output_pads, &f->outputs, p); +} + int avfilter_link(AVFilterContext *src, unsigned srcpad, AVFilterContext *dst, unsigned dstpad) { diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 51b0afa24d..cc95f06c4c 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -230,33 +230,10 @@ void ff_tlog_ref(void *ctx, AVFrame *ref, int end); void ff_tlog_link(void *ctx, AVFilterLink *link, int end); /** - * Insert a new pad. - * - * @param count Pointer to the number of pads in the list - * @param pads Pointer to the pointer to the beginning of the list of pads - * @param links Pointer to the pointer to the beginning of the list of links - * @param newpad The new pad to add. A copy is made when adding. - * @return >= 0 in case of success, a negative AVERROR code on error + * Append a new input/output pad to the filter's list of such pads. */ -int ff_append_pad(unsigned *count, - AVFilterPad **pads, AVFilterLink ***links, - AVFilterPad *newpad); - -/** Insert a new input pad for the filter. */ -static inline int ff_append_inpad(AVFilterContext *f, - AVFilterPad *p) -{ - return ff_append_pad(&f->nb_inputs, - &f->input_pads, &f->inputs, p); -} - -/** Insert a new output pad for the filter. */ -static inline int ff_append_outpad(AVFilterContext *f, - AVFilterPad *p) -{ - return ff_append_pad(&f->nb_outputs, - &f->output_pads, &f->outputs, p); -} +int ff_append_inpad (AVFilterContext *f, AVFilterPad *p); +int ff_append_outpad(AVFilterContext *f, AVFilterPad *p); /** * Request an input frame from the filter at the other end of the link. From patchwork Sun Aug 22 00:47:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29698 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp652611ybj; Sat, 21 Aug 2021 17:48:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz8h1NCohDOB80uKiXahU9ajj6AYbOmbTnNQEANl40m0QIsGIouRgvL+gZ5DuH7IkljXqM2 X-Received: by 2002:a05:6402:1d19:: with SMTP id dg25mr29633236edb.153.1629593289899; Sat, 21 Aug 2021 17:48:09 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d1si11357111ejz.402.2021.08.21.17.48.09; Sat, 21 Aug 2021 17:48:09 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=qwpkuaLs; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7581C687F3D; Sun, 22 Aug 2021 03:48:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (unknown [40.92.91.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F86F680258 for ; Sun, 22 Aug 2021 03:48:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SLSGiVcOa3mzaFvFhHaPLufY5RkOTdhn6bpbQBaUt6+hfh+F+9USUT5NrGo8rT0BHeM0XngJ2mjCjK2QEEVTQOqnUdgzYS+lVm3EPFbxv++2vaOcYlAGE57FtpREUuchSjNXq5hoXtfcELovIdv/+ccUO6qQ61XMkKXzCxctXeEk6B30HD2ilReFnypQCHEpflygXVju5ovX8I3xx1cXxcXpJGBBVEPqXEh4TFoiLv/br0enIiAqkmxL14SM4zveifrExzgObHTRfZRl0uBNBVtF0Pn8R4N+MXQel7oo/m6Tgn0fPlPLuQfJZO0X2gm2lTO3PvBzsZlIYDzloaykcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YwhRVEPnNc1tHOC0RPKEmaKdLprVc8iRYheUtcw15UQ=; b=ceF/fg5AhTo2Av16n05mv7qZvJWGUFoSdby0mxBW8hXFjcFSFvm+CTImTvsIJ/Luk+/NnXuefS0czHZr/936ETEt0Cja1C9hY1vrKwmuz9+qPGNAObtnk/+O9nZGQNx8eGvA37A6S/4E7mEfYa7XO/iWttUj36Pgw9ct8zQITlQ+9AFyl3ZDLltyve8gkuxx1TapJ5Fj0Ee4Peptqqj7JaTF+u22g2XkTkcT6varqKcbTe0kk2zb6QkogfuJb6gIE5bCBU1PTwHotOohEcIZnSuaXA6h0KzcA+N5Dz4FS2QDnv0sUyA/WO5eVLrcE38axp7OJ7cI0yeN1z4tDRQVfA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YwhRVEPnNc1tHOC0RPKEmaKdLprVc8iRYheUtcw15UQ=; b=qwpkuaLs8AvN4+FW8+bL33ZJzFLnUi1YejaKQo0QcmXm5QNyWTjMH4Yg1cypIwkQWKJD8Ae8IDaHGHMpn7KxUDBL1P06rP2o4o0X2aXbGbbyFw7wXtom2etME7NkbKFbnHKn/S9ZLv9GhjTPsn0s64g83z12mqIuykyu53gQgjmUkvzo5JDtc3H0mbmReTbc4soyQ+bBoow6wK/OmEn72E07QSPZgc8wc+vYxK745droAimhPOdDv1lw/zof7M/fvwhDo3cZ7rwByGugxdV2rsjireM/BjiFrSb3OHAniSYnOK1iWkDX6nIpWr0lrHjeG2h1oYTfPjdBzvEtn+cXJQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6681.eurprd03.prod.outlook.com (2603:10a6:102:78::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.22; Sun, 22 Aug 2021 00:48:01 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:31 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [LS70CZlH1Ef2Lj+QLai+59Y5qMtrxfpg] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e6ddbd86-b25b-407d-b029-08d965067e2f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjy+4SWrC2unfjrhKJwSRJ2Ag0mPcj1D0plv8Y36MYTrPuwY9YKgxGC8tLoRgb9kjR0vX8QM40DD3vjpDfDVZgC6RDTKUhPX/iZa3ZSCUQiuQYSt1kukT2iZGIYS0iId4dsa6iWr0io968e7lBo33gAMByvlgCZO8R1B5taEWmNxFvsb6HI5sSJFnck3AeEdjZZ2V1kpbI60vZLkhJ5KZD1QrZrc5QrO/pO5HyILGGPqyMuI0rYl/cm17CCVARwpL22ltT4P/rPJUd1iTvN22D8t1IbuZuSt6IOyJiY6qg0r+TwC2fcpIN4u6qWrPtsMy2ZoLOBn0/hOzIEsGizmRHUyjSB74sDHcBQ7HhF7JB+8m+ZBZ4E+r+ph244YhqCw98A63d5c1QQTFY2hTSGAUh7yy9UPwtbQE+iu6X3ByBu1p5nLBqHdVogmdDDBj+kzz1C+jv+NLdpQm9igKuFsfZxnDBCB8+XXK2ohV2imrIV2+sqSi+rrhnc4PR1ACd7t90w9NG3XqsM9mRpo0d5YyyIMe780T0JNYFLBvEUQ1M46U+m4hjBTmv9UoaWqXn5Y2Ixmg+BmDcFdKOhMl7xWmrALrni9O0nIU69C04HQvU16W51P/t7yFW8DtXoDDxi3HTNEfgsyftAbcdkDk237kincoa0/Tl34SWgZr7IbzmkHUai/A+liaCmlvV4O56yOVw13IGfo8SuIZCVr0NpUTkfp9ZzTGT5+Ek8lV0js35fd70= X-MS-TrafficTypeDiagnostic: PR3PR03MB6681: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KrYw4I59A3HQFKsjtlpN1y4pN0eaZVfL4e7E/7F/ClsQh+b54C15pFixFrc7AuqnBPv2hcvO28rFY6Hu1+HoUJVes/RwoHrn6qujYA/o7gpUmk0rlUWqObsB2WzWbTy5rLkSYIXP23awSZ0zjcQxBqw16+mIPzMubueSfZGaCDhXA3ypFfL77Wvf4onefHlMmNUTR0hXMINz1YGk/6G+AnfupKfGRHXVRN3KtphIW4jf+9ZBX5Zh1am2PtNgoAcfGNyIqmmPR+2/wh3MO8KWc8Na+vZX3cltIqXydWphgSnUpvXJ7KSKqW5x7rjsTb6YCrZTvFOO6HBbq7xk/xOWAJkoBkKuKTOX6rdjcjSK8GbiFo2Xb4NCI721iNd9oWxSGEMqJ+VWtvqh/uhgsl1yQKlXoySx78357MCbCs6KKnp8q/6s70ut013MXc8CZsqh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Bxw5E6XW4REZfhaMCtIzN9JcGYwGRa2tbiDoQASWVypSLVHrECMKuqTPuCvRJtnj7KeZJnm4J3NfuDyOkThbsdP0s/MTGYEngGHjQXV5KTbP4vQonKR2w/xajtOlY3GjwTbvyj4/hhWyx+Tb2tqW2Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6ddbd86-b25b-407d-b029-08d965067e2f X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:01.2980 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR03MB6681 Subject: [FFmpeg-devel] [PATCH v3 02/25] avfilter/avfilter: Allow to free non-static pads generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: nMzXkScyIwUm Content-Length: 3707 This can be enabled/disabled on a per-pad basis by setting the AVFILTERPAD_FLAG_FREE_NAME flag; variants of ff_append_(in|out)pads that do this for you have been added and will be put to use in the following commits. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 21 ++++++++++++++++++++- libavfilter/internal.h | 10 ++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 2681d04fc0..4b6a3d1e8f 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -123,8 +123,11 @@ static int append_pad(unsigned *count, AVFilterPad **pads, *pads = newpads; if (newlinks) *links = newlinks; - if (!newpads || !newlinks) + if (!newpads || !newlinks) { + if (newpad->flags & AVFILTERPAD_FLAG_FREE_NAME) + av_freep(&newpad->name); return AVERROR(ENOMEM); + } memcpy(*pads + idx, newpad, sizeof(AVFilterPad)); (*links)[idx] = NULL; @@ -139,11 +142,23 @@ int ff_append_inpad(AVFilterContext *f, AVFilterPad *p) return append_pad(&f->nb_inputs, &f->input_pads, &f->inputs, p); } +int ff_append_inpad_free_name(AVFilterContext *f, AVFilterPad *p) +{ + p->flags |= AVFILTERPAD_FLAG_FREE_NAME; + return ff_append_inpad(f, p); +} + int ff_append_outpad(AVFilterContext *f, AVFilterPad *p) { return append_pad(&f->nb_outputs, &f->output_pads, &f->outputs, p); } +int ff_append_outpad_free_name(AVFilterContext *f, AVFilterPad *p) +{ + p->flags |= AVFILTERPAD_FLAG_FREE_NAME; + return ff_append_outpad(f, p); +} + int avfilter_link(AVFilterContext *src, unsigned srcpad, AVFilterContext *dst, unsigned dstpad) { @@ -754,9 +769,13 @@ void avfilter_free(AVFilterContext *filter) for (i = 0; i < filter->nb_inputs; i++) { free_link(filter->inputs[i]); + if (filter->input_pads[i].flags & AVFILTERPAD_FLAG_FREE_NAME) + av_freep(&filter->input_pads[i].name); } for (i = 0; i < filter->nb_outputs; i++) { free_link(filter->outputs[i]); + if (filter->output_pads[i].flags & AVFILTERPAD_FLAG_FREE_NAME) + av_freep(&filter->output_pads[i].name); } if (filter->filter->priv_class) diff --git a/libavfilter/internal.h b/libavfilter/internal.h index cc95f06c4c..6ddf024d93 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -68,6 +68,11 @@ struct AVFilterPad { */ #define AVFILTERPAD_FLAG_NEEDS_WRITABLE (1 << 0) + /** + * The pad's name is allocated and should be freed generically. + */ +#define AVFILTERPAD_FLAG_FREE_NAME (1 << 1) + /** * A combination of AVFILTERPAD_FLAG_* flags. */ @@ -231,9 +236,14 @@ void ff_tlog_link(void *ctx, AVFilterLink *link, int end); /** * Append a new input/output pad to the filter's list of such pads. + * + * The *_free_name versions will set the AVFILTERPAD_FLAG_FREE_NAME flag + * ensuring that the name will be freed generically (even on insertion error). */ int ff_append_inpad (AVFilterContext *f, AVFilterPad *p); int ff_append_outpad(AVFilterContext *f, AVFilterPad *p); +int ff_append_inpad_free_name (AVFilterContext *f, AVFilterPad *p); +int ff_append_outpad_free_name(AVFilterContext *f, AVFilterPad *p); /** * Request an input frame from the filter at the other end of the link. From patchwork Sun Aug 22 00:47:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29700 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp652799ybj; Sat, 21 Aug 2021 17:48:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2ki7Ump/1K/Dv5z5gMl2oGYr5uEi3emyS4uiGwS/QSlgY4OPxPRS1Zw7l34ltvZXEBIGj X-Received: by 2002:aa7:c88e:: with SMTP id p14mr2509991eds.174.1629593314424; Sat, 21 Aug 2021 17:48:34 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id nd17si12517530ejc.732.2021.08.21.17.48.34; Sat, 21 Aug 2021 17:48:34 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=A3LMlSkN; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B232680471; Sun, 22 Aug 2021 03:48:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (unknown [40.92.91.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA95B680258 for ; Sun, 22 Aug 2021 03:48:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=noD+NNYdz2ceylaNcQTanzv60ZmwY6ivRY/lwKbgs20pqUhZinK/vhomtFPVJrIEN4NVoOE/hv1rk8UVRG2tlJJFH+50WVr3i51KMEjBkc5EB7hzxai+MnqDUf6sDXuLP9o71PmQX2+M0FZpNL+5M1aOkPzK/gX+kx+1lk0nZFFWesT1afsvlBiyTmcC+rWIYcSuaQZJyXnMHJZj+KqHMxnLbYrh7lHcJwRUlrsxcPObw+pereK6gBsdvkDqP+7n0wVoZBOITVmLA69IxvqF04H1B8xZehl7CosLCkiwRvlIshB0uzIx8uDAo0CXtU4Xia+irVvN1YTAS+X891brxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=r8ejk086jH6efC/1O0mWCSAAzynAu1G6aJA6HDlFRfU=; b=PzvtZyYkUMWFIkDkIPBh/Ez0d8JnjfGKrMj8kYg3eZnF55TwVAwbqPgsCjCJ25KY14mg9gLJ7eb+TWPY1umiUsmMIaqfnJSWAW8cSkWakBHIJIQdsqEBTGgqjqHW9AQRX/w/4rlxlFt5gnALG6rXNSNyKdboSWTryEE+qhkDpsr01rg05azC50Kqzqq9AzQSJhnuqjr9jz9+Llh/GKgMf4K/T74/QBVOCkZwaptGtqB1WSZBdO4J9YbHF+p9YDBflljvXkOkGf9Q+aBFU9QkHdF+kDy97FYuuFwMMuF/8T75lmf6rDZAAHTjGCfF5RLT6sgQT9wH5Fe5d583MO6WIg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=r8ejk086jH6efC/1O0mWCSAAzynAu1G6aJA6HDlFRfU=; b=A3LMlSkNaEH963gDVx2UeqoNeN8ytq2sfoEpVwW+aTzw8uQ/0N8f/kFGmmdyI/PdqCBB/7zHLJ4G2oQte6GFnbpVszsEybcdtCwdbp41RSbZamrHqnSYIy0nokVW/zBSO0SF7rF5akafRH7hB68BEZNXoQYAha9t5Jc0I/5EPPEh8w1y3azRwjSrjU9THeGzEeSev5gLaDsEOFJ2fCVYLwPQ6nD6qeeY9A6tqMlAy+fVYWzavR/c6nNXHaUhfdNOxF97FYlrW6u3yZg2P6SlofQkNmz9+EPNGTOAQRemZ+QNXzOzFV7E5MYkmkuDDWiOqpvdohyNYHq18prG/DKQSw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR3PR03MB6681.eurprd03.prod.outlook.com (2603:10a6:102:78::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.22; Sun, 22 Aug 2021 00:48:03 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:32 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [CNodaRtbvxLF82vJT5Htk9qlGAmimtjN] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ea93e71b-47e0-4f26-e440-08d965067f48 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjyuigJTgAtPIZBRvSERZGlPfw48dUbZtVr9hQ7DNJWRQG/LdFpWx5p5vhr1ng22uzFaFiSdKLfJv72Ny9/0nv1DZ2GHigod9WLKIBVqVn486SCft+pYWYNd5DkO2vC5/elbY6g4bETRsEcfvgWMK6WU9wjHyb/cCu2REfW6i6s41RPyYVGGAyxodjtrdSYKLgwRGTYkg0+wBouikT+DeSZpMGOXuCXphJZknSof0DTCgonNu49TYTbl/3U6qfCleIxIwqYLY6DaOK9Hz7VVZAnKehaneIYIgE0wSJxOKJGymu9V+QIXL/PgfG4r9sCC999J7Cey/aPagnnrWY6uUXCXOoZaXYRexhs8FI7+Y7fHi1GTX3F6rbqxPT8LYra0sTEwkQqIVh+/2cfCO81HaMIDFz+IefM+djvEy/M8MZlkBbl3M4oweJvqc4Qe26a+eYyTgy4bLMkLkYjTPqfD3EeWdsIyBzHxFNyfp7qFvUhiwFH/zGUq4R0jEGN+K/NWsHwvg5iTCxh+q4N3i0xSZlAKyTc97ysEh1ExBuT2An2ll8v91DE84lHySNmJsAb/kDJY837gSL/q0fqEs0J3Sfvydc1laKwKg0pS2PBDSlWDiPRSZVCgU6AuJ4KpKNxhvBfkdWjCT5baNRWpVhdDpSX1le9LqDacrDjTyxlJDDYfvg3qrxm0m8ghGSHJ0Z8KTHz9wgaSVNyjiLw++AMJ2T9THLJvAB1D0J+zvU33ptIw08= X-MS-TrafficTypeDiagnostic: PR3PR03MB6681: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lBy0VRSGgyyII6o4iPkB2TD4UEQzIr7di+r9WjYJp7w9Du/QjW8UNhen97vCtzco7pIK7PU9vpe2FPuSHQKiruaG41vW3IntsE/p+zy6lA5zdna+wErHl+pPb3lXDCzpkaZEqrGQEBqRS+ckEi7AYGaZ2sRk8FIi6Np6aSX76SYVuSa7G+uBArGV1qjSy6Z092LIYkjDzbuk0B0f3dYankmNVydITkQsxI6IleitwSgqWB7DPsk8wTRfME424OTuE02MvWxzew36py3xkXtqH0FIaExnuyEoRL8FBe5rCkYxwm6z0lpAhaTm8/yIKx9oUc3ryAh13Y5VJjVnv3Pt9sy6oKVvYTD5Y4PyTNKcKZSXpnUQ39Zg6NM5GgqWqROMnV+0LeAIKj7stFCuZv0Jh6nluGi51dDyWnYF0juwv/NMeFY0j2HlBTphFyvRDgd1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PmDoxLXwjRm34+uaFs4KUwMuD7ljxKJYA91xMrlq0Eb/pmmccV0SbxsxaQIuiOGDeRVmkYpdZRY7ETejncWJHeVMYJAvg9dwxroyhWMy/dMg2iq0QbqV0ZfmlemObeLoQE8bb3Iqh1vBvuxG4106Hg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea93e71b-47e0-4f26-e440-08d965067f48 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:03.2215 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR03MB6681 Subject: [FFmpeg-devel] [PATCH v3 03/25] avfilter/af_acrossover: Free outpads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 0WQcmyHXXXSF Content-Length: 1276 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_acrossover.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavfilter/af_acrossover.c b/libavfilter/af_acrossover.c index edb257d634..8306d532ac 100644 --- a/libavfilter/af_acrossover.c +++ b/libavfilter/af_acrossover.c @@ -191,10 +191,8 @@ static av_cold int init(AVFilterContext *ctx) return AVERROR(ENOMEM); pad.name = name; - if ((ret = ff_append_outpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_outpad_free_name(ctx, &pad)) < 0) return ret; - } } return ret; @@ -539,13 +537,9 @@ fail: static av_cold void uninit(AVFilterContext *ctx) { AudioCrossoverContext *s = ctx->priv; - int i; av_freep(&s->fdsp); av_frame_free(&s->xover); - - for (i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); } static const AVFilterPad inputs[] = { From patchwork Sun Aug 22 00:47:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29701 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp652681ybj; Sat, 21 Aug 2021 17:48:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzXpXcAbtceN+uBncbjkBeIarDk9N7LIIBtQq135AELjxqhCwyQOcv9FieodTdePdY8iSi X-Received: by 2002:a17:906:3e58:: with SMTP id t24mr7153644eji.502.1629593299270; Sat, 21 Aug 2021 17:48:19 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l15si10194513ejg.444.2021.08.21.17.48.18; Sat, 21 Aug 2021 17:48:19 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=ohnTuX9L; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8DF2768A2A9; Sun, 22 Aug 2021 03:48:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E947680258 for ; Sun, 22 Aug 2021 03:48:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aiY+4tPvzP46RX8cI8gBAiNNmLsWT+FEChqFqCQwBLDWDKlm93Jjp+E1G4Al3XkGOaJvXpOChTUZLmIe7Z9SDnsutuBJ7IZhlTrIvEtFNFTYT7j+5453P2MdANtr7Ns3oeY1HmP0ug5q44nyX+NJRVJ6+TGhIlBno/n4cla70XkWh9goxDM9S162bexn01m23Vi1OiVLbOO4yPkwzJHa16yAAtiHfaF17DKszicfuthiUYKGBdLdYchNDMR2U+elAAngas4Bb5AE9KGVaenqfgeczi1eYTtB0IlFlkjYNyvGDNsNteKWNTJ5mwPXFW6C5ZGFvLjLef81DUMa8q486A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dEOIloOo7kfhy86k4VC8pjRDclmAktcGOyHkp4QDNhs=; b=H4qBhHRbH9QQdGZprwVe4NhFUU/UDHfRy3PUunkN+u+H1Iyz7uINLxKX0Cg30cNlUfQaTkn3TZWQqFvap16XnclSPQh5Bm4QLS1+jBvT8Mj9aneCZeWFEBZvfMOY8KNIHIbDdc3SulWEKRws5UAIW6N99IR58xm+nFw3zSTP1vm8LSWgOX+6QedoNDsnXrhs3nLPTQWK8sQWPY20hiu6tFPsS5P4uT4slygXDYMNXgRCp1Tu5Q7SOLVJIU4XlU/+e5cc8EeH/qNJPZKM93z/IzxFfQb/h5X0KBh86CzqvLT7MO6C+5v0VFY6n0uF/asct253/BFll4nyYq65N0vk8A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dEOIloOo7kfhy86k4VC8pjRDclmAktcGOyHkp4QDNhs=; b=ohnTuX9LpeVEFIwhcGJ24TnBSvMU47CRVQgZrJLhtCoqLf6N288Q/5ogZnWzWRcT9dbeBcHspGVdraFPsStOfYXJqxQE3BEkWOReoSUZdtGA1ukUioQp6NOitO9IjlB2KVgK3KBUhgH/Q8DU0rLapAbqk1Mw8TImU7SIPFFln9CDh+qFdJ6YmMZi12X5SiNobc3C2igEL2EDEIzwXK6HJLOuPKs2i4oiGXWbAyq/EATbzbrb/TYkBGISnJhNhYwdx06rGx9VsKljDroCWNmUnvcyKaHf+IBbEKy2sC0K3pKOHyAiZjLbA+oFEvrtZm4Zbk394pp10E1ovcT5l1t3og== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:06 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:33 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [vvgx7l5Ap6d1Mdn3SeTW3UvCQC9Tezxc] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d88bf3f1-f9bb-4756-35cd-08d9650680c6 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUPHJiP61NwviEKWmldPD2hOMrq7iUo0JXKiOIxvYQSGO56ABZHyZaj3mLD+OKHW6SlTJbi2aOjttwVtYmRjbEP0NpCWRhI72y9fqL+J4rs50YSxJIc9TLrxouGoiV5KM5kLA6BLWu4TV856TproacI5indnC9UUIWcfpkpSFupi3yx7pYsPHlFNp1is26Cbuj45an06LNaSKaG7jDktNgP5ynRb1nTzeHjN4fmbuX2ZGg4M6Ap4bWYYlQNWQpi/rGPWGiAQ2whsXsdaR3RswE6TjE7AK4qRAnxx07/jzPY/7soVaVaEtkUMf3/IznJQPlxZ/j+rKKUeNb8DsvvFRL5/SsuW/XkImVvxSq3MDdnKyP2n5GEPFpy1L9W7fbiyvrUp0MI2t4OdFulKRdPH2mgNKilXtfjEseQ2J9nU+WiMUG3346tpEKfdmlVmNAaIHD07XrU4TJZUB0N6k5cimZLHwPENNoNyQGi41bB8rG+uWf0fDkPUwI6Vxg8GN0ecv9H1+aFCg53+dvJbYEdmGTZKmOTHy60BN/ww3Kf0laEEAB24tV6NcK9Vsa6/IsRUL5UOX49/rnlgh58mJbU+helPoJpeD8lVzQ/YqJcaw9dHt7UMy+r1Udq+xz1Wy4AOOVe0J7Xm1wzbRBweOUa9O88xLqZeXgBGSdoP0zzBJIHTQhKJ0A8aIVxR4IgN/5piAI+KZKKhypECo9pl34w0JT5P6aHC9B6D0U= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9qnGrnb0xSei69m1NT1eW1wqJIEwGpj62DOrKfzlq9leQAKopC8eoie9Wc5fJG5z8VW2BVpL4VfTiQGk5v6UrFdAZ5F/TYglLv1ZpoMVgw0b2+dGzGKqXjz4wvv57t6RTV1r4bQypIkcpnWP/fg/LH57i4vDn5wWPI/WTGqhLe0v6ASDrmJjXMuIEsvCClTwKUHHYbPalDdAARzBNPA5rAnA5J37OFpTl9ehtgHEhzURIi3CDg1SlsIyWQRxDptcBa5ba9oFYUEx3RoqZLJhv61C3Dt4wU7EQGB5kPPjL1O8fP1PI2XTmdoIm9RxPd/XmKoXdS6nnDBrUngb4MLJGSipC8rSyOebjrvY+4ZnJYLwNS53mkvWJ2Ve84RlpOIzA5rLxZKuEA7najzch5JFZmlyhQbaE3vHCHgTC6qyfaOhHEpZVqjP+pEdMdL7atcp X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4XZ/Dk5v8SpAPa0hNHM5vqK/g6LK1osYRqnpj3JOuxyHdenLjT4a5rvtHbaidU6b+XvJD/iepq/51BnHYiERPf0p+dxLcRadUqmc3L3S+0Sq8fKBFvlwC+peqqQ26Gbiw/W3NsNnDHwVI7f07hFlbQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d88bf3f1-f9bb-4756-35cd-08d9650680c6 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:05.6996 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 04/25] avfilter/af_afir: Free inpads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: rDTC89hyOe57 Content-Length: 1197 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_afir.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c index d3868a7f2e..b74e7ddfae 100644 --- a/libavfilter/af_afir.c +++ b/libavfilter/af_afir.c @@ -792,9 +792,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_frame_free(&s->ir[i]); } - for (unsigned i = 1; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); - av_frame_free(&s->video); } @@ -849,11 +846,9 @@ static av_cold int init(AVFilterContext *ctx) if (!pad.name) return AVERROR(ENOMEM); - ret = ff_append_inpad(ctx, &pad); - if (ret < 0) { - av_freep(&pad.name); + ret = ff_append_inpad_free_name(ctx, &pad); + if (ret < 0) return ret; - } } pad = (AVFilterPad) { From patchwork Sun Aug 22 00:47:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29711 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp652873ybj; Sat, 21 Aug 2021 17:48:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxAZzeGadQg+U8cpDz6T4jIj2KEttlPdfD0Oc3QcG4ogbtlRFiSMfNpHz0gk3sV6qwmJ2eV X-Received: by 2002:a50:99cc:: with SMTP id n12mr29737778edb.53.1629593322763; Sat, 21 Aug 2021 17:48:42 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i12si10207199edu.543.2021.08.21.17.48.42; Sat, 21 Aug 2021 17:48:42 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=ulz1bIuc; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 81AFE68078F; Sun, 22 Aug 2021 03:48:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 881BA68078F for ; Sun, 22 Aug 2021 03:48:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mFON1BoKcgaBojZ0RuXUfwVdgG0OfN6GVuidTpplBpsV3cLN+XKKXbGNrUcviLhd040adyxd8LTs3HkzVhEFNT59nSqt2jOIJSqCbFCFb1sJg7wypD+M5vh6tiZ0iNJ2OUHkHPEgggJ7TOQpUu5z4D3u9aCXWo0Tnx1vE2oCxySTi7UNZHdddroglcbB9F3JGWWIpMbzlKdqCcVLW/CFNuyVTVMf6QfaSKhhAGz40Ui5bt6TJVcImrx5s5XD/VfETHUbhn7lmEo30WuVU/c2bwGM0DIpp7oCz2zhgZ1VmuV+FPX/QTMjng3ZA1ufMUJcCPxFFacvg28ktw2c9W+Pbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zN+dQce9kkM7vem70MwO3xfhJXLU7qz3UACewxYG9tw=; b=PWPbslcQU6O4iVODMKn5Mq7jnx9CxdGefoEMgC/l5ZlKg5zw5fDgfnOGWKRwdiCDAMaPEamPLCYH824AgmPY8ziX/9GfiFMAMgDywvur6dAlm6Qt3RJEsg+I8dt97HXk4tN8BR6Nl/Uk/q6DSXwEbtAVOQORibptFkOHQHKsqjz5FC5qFpxIDMgpewYjUZr1xZoWZXEnXecDE8B7XZExWJjaWzdgDgn1+hnvApVrK0YTTvKS9+iDujC6bumJPofU1CJcUbuXfVPeI+l/m/YtJgK4FJEu2TKP8IPVSSnFWRv5K5KxlqrlV/e4iNo1LZBNIjL3gZ5OEaksPli15+/TOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zN+dQce9kkM7vem70MwO3xfhJXLU7qz3UACewxYG9tw=; b=ulz1bIuc9jvBR+TmSWWrs5m43+6bUnSD/i2vtINUkD3oW6Gq+YQtTRoiC3QK8SyaZpH10zX8DT32ghDnmZ3QA4q914m+qB4DOP/sO78F/zvD8hl1G66htQiXLEzA9WnuJlV9SI4H5g79qqDMho3cKJ0rv9XBxoLrPHJJA01YAJHEEaEWYiHUIkFDbMqVvRzxCDNTV0duj7FydKZWTCqPudNJLcBQkXX1snnX6HWX4l7PKcm7tLc8GD7cc5PgWi38PjaOS6gr0N3HF5Q9JKicH/TploWGZHbdwwCI0VkTcYktW+yodPKHyVrbl+V1XfdyKI0vsWoN+7C3tG4jRH1QYQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:06 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:34 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [LmQTmi4UQB0HGwIDQcj4aJjfD+M6prPI] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aa42406c-5af5-4bf9-facb-08d965068169 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjyEmRrECDLydhKoAsVaS4MovtqUmA1sBoaDJbw+k/f6wP1jGZ7nEaQoWfoapeb0zCUaSScvSE2hBadRiSHPwFChupNKcxxs1qlD127xwFIUtvyGPIoN24a9/v+Oz5/l7gdISioPfZVXuPQrbhf/E5I0DeD0Q/mdBSUBMiLC0uTi9rT7JAHEFynx2nDB5O3QsAiNBwCP/9hEs3cES9tg4Q9qIbws0tVEgE3QiJMkp/W8H0yboCEuyCqXfhrP29imc3dHSL3pwVNKOjCyylMTDqZMNh88qcamLiRnpsqAqOb7a1fM8QKqY7Blt6NnfpVJf3LaWGpB1PGF+lLgmHjCkkVw7Kea3AwU2dmjMq0VS8yNO8afAPR5OMf9qp5oHaB684ThXvjyfvS8+u7ttAAtrpVbxkwEh9XjelsYJXwO6lUhPfIUmRtBq7xldalVWkG1Y+alAdwmX80/xQ29HBRmWlZFfkndhri1umaOqmGzZRL4xUuduib0TANugv50LcRqWak/iMX3Cx1XEpZoUWz03gg1l2/X9sDHhWYfSiIoeb3mmD2eu4y3LdeIjllKu3bnSHs5g9rYOictrmQ2a4KfNRfEQLtdI2+WJcNwtPie+WNZ9bth4ZtbwjRRRvY+PT/4LgFPkz6LSxj6ck5V9ycSBulli+LJzD6xaGD7mpSkOsMd18tq3IDKWw3YtKOaqoV2PlgGdn/xt1DoEflfwmAuTQAXfbLzakrS2QBnCyvNCQUnTA= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jxxw+uibD1x2JVhEGKGet0dfpZImonG8pndZPDWRt6Bp3rma4OB4B4G4XuBuuJd42lRiMkj4sOxKpx5mxgN5U5Mc7Av9fQTSZDym+mI8Om+XLFPMC8cMPrxHTmPQXpLeS0adDMYGZnfqdeW0jwziVv0A1ju40uo2Zrh+0SmzREFBXa5gTfkLoFlPSXTTAuvQkR0q/Sg8eNWRmaFek8ve7YScCiFtNJKWHjrdtHC73dJyQf+3k7mpeA7IG9ThxhehPYR4hkEZO/tAboaLrUvh9ktpV7XyODm0eSrEsIprv8xv9BVPWAUiOgXinCeCr4aaTF2i8hBUfPhirDiE1iz4BFIAFhY7T+WrHtC773zDnl6REbGn2N+Z/zyeo4pQprWAOe86JVo0T6fX5hYoonzG6MhDfA/v4M8RyTQrDk06wE1HnnbXdsyMmkYW0x0I5lkp X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BJjYjMjpsZFou39uCk+xDjOskgzG129o9fXnLhMA5YTgqRcsfXEC8FjJZLLfkTOH4j+ZunZkcqDd/8kUXWgKkEyLjkjaEiDIVHFEekMC4YqZcHUVszWK6iJU1fL0+bw9YFidIT7KAlIc5aQOGi3mvQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa42406c-5af5-4bf9-facb-08d965068169 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:06.7052 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 05/25] avfilter/af_amerge: Free inpads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: kbFdNuwqrPBD Content-Length: 1203 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_amerge.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index 0e8bdea436..d67e3d7e32 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -60,8 +60,6 @@ static av_cold void uninit(AVFilterContext *ctx) AMergeContext *s = ctx->priv; av_freep(&s->in); - for (unsigned i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); } static int query_formats(AVFilterContext *ctx) @@ -328,10 +326,8 @@ static av_cold int init(AVFilterContext *ctx) }; if (!name) return AVERROR(ENOMEM); - if ((ret = ff_append_inpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0) return ret; - } } return 0; } From patchwork Sun Aug 22 00:47:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29712 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp652977ybj; Sat, 21 Aug 2021 17:48:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCWSewvV2HaDalMr+v110R7/C4FO5nDEFSZO/fw9pNx37ma2OfIJT9rxQvSKcQRak9OTdc X-Received: by 2002:a05:6402:2794:: with SMTP id b20mr30936460ede.126.1629593335066; Sat, 21 Aug 2021 17:48:55 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t14si10466916edr.573.2021.08.21.17.48.54; Sat, 21 Aug 2021 17:48:55 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=We7PVYnA; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9651E68A408; Sun, 22 Aug 2021 03:48:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E16F268A2D2 for ; Sun, 22 Aug 2021 03:48:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S4+LaU5YqVX5APcHMVhKwkuBLoMmjWIGpmJBEiGkgJSxTPnYmV6CSaGThNMCNCB3ASIP7MJPETTNU5lzcgVZNcClG21BaEWLtWXx84PnGUG1A7XSB85tuXfhyhcbRz6B7XXaqjVA90nx7LReQxdEAyXwRm9L4+rulwBcp169pWTzu0BdV04BwUhyPKuTpdQXexrBu/8LLnXeX8BduUV8lvWB2BtE0Pn/krRoUkYD0cOjFsTzCwGxorzhX6YoIcLGtqzUy5SoctVLGGzlytxiorVOgIJboVsUN2XSkbZnsSjQos2ljQ/6g+zTa1EIthsAuLbD/qoS2i85jSGrwF5iFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hD3r1wuWfnY0n+PuTLmdgdj+j2T2a3DPk5yMlUZq9fY=; b=P5jAhr6uixoCBa3F6nwa3PRAziEJG8NPib2aRhYcCi5zTeuvMiNPV+iyVuaPqAJDvjuKnUfW6XoZZMDbz5P7hrItDKxlIuabswSTWb2ftAIr8ZNLP2GSCvemlZdtG2mo/iJ6L89BI7o0xZzACwY+USrK9yGe3RUh5c2XzD26iILmFKRpNOx6009VdqOUd8rhT7amS9b7eMi66xwOjhHKm84U88WC94Y/06iie1krBghzzB1EY4BgCJewo9ZrabE0mSxLg0V3wfLI0lEu4fwCNfyEHUMazKyzDR1ngAuq0Ia2QGoO4pYFteBz+WVgCvBMaCKKFPc1fNFApjeRmDTTvQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hD3r1wuWfnY0n+PuTLmdgdj+j2T2a3DPk5yMlUZq9fY=; b=We7PVYnAteLy3ljJQjOZPwOxe+54xg0t+fX3ouB090NXYVQd9PrOREYlLeCQw9SpBIezDUwELJV4rTJp8lX5y92UC5znPl4hitZPXr8+H+QHwSl1g0JEn+CHq9eomFpKgFY99DWYXvQPoHH5biZc9YBHfFDrDKUF0xR6zMjYq639WulVyyKHpEYHR/wt+TQiQnvx5tyTYEQBM/wZ4KY4CaR47mxSbiQAKKQjjxKFN55F4WrdmvGrnSYiXbwdo5YZzYTMSLMiaE8aJE3kCks9t93CG9mKJpiPAcTnVJ2O7OETDfsrXtF/bhB//N5x+DFv5BQqj8B9DVoQUD2CW6zblg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:07 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:35 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [+hQOHPpAc4+PRNrlAqYnvxW7OgT74zNk] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c6616cef-ae3a-4328-bef2-08d9650681f5 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUPHJiP61NwviEKWmldPD2hOMrq7iUo0JU8QzgWUblJ7yEf58oqeaxbVZf+6QGw7lgf3z170aw8Bq+opGq8wq2vpXwPM77SlTGe6DJBX+E1sN/JPnTj/bO/aXatXywIdLBMVHHQ5bPYPphKEsMta9rkVz6JUArVkN1Xq+8SMCr/C94BtHit6/zEe8P+bPirF4tk5kwAKz6uoed+l0AniEZQQenTIvIf3nhPVhrLJCTV7zcUVzODxjhI3/H2iqgov54wI8fdKsU1sQ8QwsrQeM6tBSCwBGeawQtkTfYhSL+7XyCaTPJFIH9d+wYmVLbyoxN22fMCseHkWDf03/T4mJv1y4CpKm4DDFKqPZ+fo5PA9EJM1B1eH8fLch3iurve0ByrJORfhYYkuSuKwLgzA/KWfpl4M9hynB3Nvl29DREIuzu5OfLThAISjX03jVw4AH//WZpuohTHjxxyHwqRZ7zoIb7RdbVfI7BaJoeBO4jPGGnqjYt5jLCvGhjJ9sDfnrLcMQLD1e04HVhlZe3pWrrVkIsLoe9f80LTRQfhLchE1Z4Y1XJGVTWApDMWVdyZoTngq4nov9GYYFziSedEoOnEVP7I5fZ0rAnVq4nL47WyxSBfMabFOcY3LSVhjCORX9A/bmNMSmuS5y9lnyb4OjnDUR/NoJoLHU8V6jLHtdYJhLtvIFnhEUMSG7eUhdkcwH8kiAbjcxwY+NpejnfhwbVFlYHUTtxtDKw= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9DHNus6OWGGaUTGwG5zZl27maZs/QQJ61gKV5e+6MNfDqakxyJferQi3OMsqA/zs6XAVUvd7GvUDDRxo6/Bd/MsC/qRY+QkWMOlMEYvHBdm8AT5U2xZm+1yhhPxD3HOLISuwcm861o+GZmPLaAzDNr+tTaWutoJlBKNR5Gf1MpurG4UBO01r2hcNY+I/HLnK7Adfp45q6/c5htFM4I8DKBdbZgC6Og43A4CAh1F36OMvm3xv+qa5CYAA702gadWUL5I98bC/lLMOzWYvGpOsQ5Uc79d5J/4QUpbgZPeGRhK3jJ9GHMzxPYpLzhSzy1T8ui3VmW74S+IcLNuuFHv02XI3Rq4J566dKVqbCxjzwuvfwIR0YV+8JeTla6ckk0xn8nWJrsi/yknDinX6UswN1YVTwYEmN/2oJjp5qqOCgsEWrIz+tHqwV15VBZC93veB X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GGLpnXpzKnjSzdjFGl9O3UVv1wIDSE8yRKqWvsh4yg4v906RmLrTzQEW5sKmZ0xhQjyVp0nsEgt6kCALZp6uTLrRazIhB5KTxVojkMOjutvWB1Q07HYxRrm9EuNMsAyPV5KSowRCVt43SUDeuBhRYA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6616cef-ae3a-4328-bef2-08d9650681f5 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:07.6242 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 06/25] avfilter/af_amix: Free inpads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: z56qU61Nh4PL Content-Length: 1233 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_amix.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index 9625864038..41212d922a 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -553,10 +553,8 @@ static av_cold int init(AVFilterContext *ctx) if (!pad.name) return AVERROR(ENOMEM); - if ((ret = ff_append_inpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0) return ret; - } } s->fdsp = avpriv_float_dsp_alloc(0); @@ -589,9 +587,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->scale_norm); av_freep(&s->weights); av_freep(&s->fdsp); - - for (i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); } static int query_formats(AVFilterContext *ctx) From patchwork Sun Aug 22 00:47:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29709 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp654045ybj; Sat, 21 Aug 2021 17:51:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw7WW/eGIF/ajCwF3wTrNhSd8LeJYMRvACeX0TVfa9HdCXUwIrJ8ngSS6IyL7FjJjukvgPo X-Received: by 2002:a17:906:1994:: with SMTP id g20mr20616803ejd.397.1629593460348; Sat, 21 Aug 2021 17:51:00 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hc37si10901302ejc.556.2021.08.21.17.51.00; Sat, 21 Aug 2021 17:51:00 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=opv7Hdwk; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3753568A5E6; Sun, 22 Aug 2021 03:48:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9CD8168A41C for ; Sun, 22 Aug 2021 03:48:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QeYaZJWygBqNqy78rLMp+fqeNIJWGgclOK9eIvvQxzfQgpbqZKKKPvZyfewfnNAvdh/nYM5m5io6hk+/s2PpKOBS5qU6NkW2mvk/mwpFf4lSEo8H42uq575TJLd+tPPtnHAEoboBQaYG4HKAqgpTMd6PtPAjQS1Cwr7DyIqVZjxSi+AjIPG+Ig4pwDJSf/c4woXIrXbyeaaOwCH8xNmDl7n3TmaVv4QskV7TWdTNpKsVK7KPjn2lOROc5e1IkvF41pNX1q5c/Y1o5lilFwyfnP+BTh8Qgf2YAtpfndmoXg0c0U2EICUVB5s64eqOEz8IGIaX1+cTBouFsio8ROHgMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BjOh1lzLo9M21tHnvprk3s4mY6uH+2B8ZK+uw37rV/s=; b=Cq4w156pffozBvKmdKHoBpevdCbrn9oF8gqNeSfO0iPjFPueFflIXwqunWCXbPHk4V1k5WpiClSjnz2PeiFgleqQ2S8Z7hV9z41NZWZsShP1Ht0axt/NKuylmwFLR7xd98n+/gJ6sFkFJ3hLPAQZVpo9kINjxzF7jrMmrC2sovRMLdFD6Y3eL7/7VF4wWhKTmMkIABrTbZRo/wtmFH0Sn5HRk9/w3nysRDvdhc/LUbpg3FAaXcH9L27AVjOhoNCR3nj5+CcorWfsv2yOkuVWsNXy5tTgUGas/oQ3mem/DOHhhWyDoiC3ymxbmMEuzUicCCVSYfPEP3ytDhwRHHGW2w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BjOh1lzLo9M21tHnvprk3s4mY6uH+2B8ZK+uw37rV/s=; b=opv7HdwkEJIljMvShasArprQwgTE7z/FAwqiDTXoGEuq1dO7+Xc5Rqa+I0lVcjTvB90SytZS7q7OZfrkA3rkyS4zqQsrHS0VVOru3uKKVQqkbAMdMmClb2rjOgz055MG0ywHBWfyCVYjR6OPmYSRtmRvrxIFa17X6B1uvbjYEmN4QJF4aELMaupufh8uf1QSC42ltoL+D09NlR/qwvBhuSng3STAeMrBrDDcJJuVFtwyrFHHn5p5jbz7hunrCk1hQRRAGtk9+KdcQqu5On2gsvVT9igYIJjOrEl2H/u8WsxxQc0Rw+62Ss6t0MdcbenRyxyCyrAnzPlUmzUGxCRqRg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:08 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:36 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [NgUUPr9eUg/OvjD3hl03cbpZ8UzXds2r] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9c7c4ea2-a531-4420-8c79-08d965068278 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUPHJiP61NwviEKWmldPD2hh2QjJlHPtkzT20fCwsaC1ukUOu2ozPFdWVkgS9i6pKflDFj9U4CKhksk0XvUROPMG9SY3Pr32P85lNUJercLWM+D4puMKjLIB/SVr2Uiugitjsi8nGhqZQhDcONXOUjf1ID3+i2H3DKjdNAXuGUuxQIm0PM1ciKzZq29SELJe+M+soIOygGTn+JWvZQyjJrvFfYVhc9keKr/FrFYkN+qYlDpoU50fKfgwEBGXlItElEC3bdWabiYleF1Y4+qirwy8s0bl/eUw3F/xVYlJrQXWSafe31MeJWLpbRI3WWVbCZEeuA+P3uFg/UbZEItXNlnE9LSDvQubJtwxn4bRNVuQD/O3lENMQUAqV1uBbINYbSZV+W2gkTCK87ptgT9Wvm38K40rKP9mzo/S88irrrEnIakUyrkm6zwhe5u1r29Z80c/QppOrEm5Fw8i9jChAQ3viNIphcv8+bqv0616t+mA3m16LwRVnKLW/ShK4zGOlxHmev4EYzGGiiE0xYNGDxgaYyMSXIjWYEqm5aVzucOQOYkrNJa72vpKfMZUDs5U7mH9PQA1S+vxVv+PfyB9iKoYg0qxf01ysVyOWu6mLBKISd2tnxoFkORRcKFSO4dWK4Hp5J58tvEt2sEif8fzCrhl+NMu+H+E3i/4P/4gFf6Iicyy5rSaoJNiLHSD4su+pbSuH2zCLk3X3gudWB2eEeudFqhVFb1RPg= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j5CbcDkOfBL/VY+IfcO+R2B2ERQn8a1ocNo89AZ0+pkVfYRpqVGbqVPSNm9P6ta4y5o59IFILfticftrTVvzb1PSr91Uf/wnjkmrRMqYooEVS+eyzG5NCi0IvjnOWvCesFG/NLY3yoIi6V4g+2zwXU4kt6eYceH0ju5q1kP/QIQtVhnUAw8NWQEB5SMd/LbSSP4ism7zvUnRAGBxdJhRQj+xwZtgcJev1zqkgGx7YL0oBmHAju+7J0sUgeXZ9o94KDeWOOm+bGJ7H9KurKVEbnNNERSwHPi/lS0+5xtljtRWxP4MKgbrisOJPJ50Ko5jyDNjbkVT+YOja0fa8yKz34vwo/fqn4dRvsIN437ipLcHhEBN4W3Tr/GTjdCl9Z5ajwhMxYuEkjayQNRNC+uAiRwguPlYUoqbXBF9fb965bKtSdt4htg1STatj5S3WHBd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Vi0RS3VJXZkecIfIZ5ZlJS9rQlQubWZ2meIpcXd6Yv7dRgKXYAEU7ibABzxpD3LcitRyOtMsrUchCgH5VOrlQVXHgWgzXoqriORTQJBqwLPGHwk90vqI3flY3M0nXOP65HcFSINKL0rnBi8aqloZgg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9c7c4ea2-a531-4420-8c79-08d965068278 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:08.5003 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 07/25] avfilter/af_headphone: Free inpads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 8CogmS4B2MOY Content-Length: 1282 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_headphone.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/af_headphone.c b/libavfilter/af_headphone.c index a2f18417bc..0cb188b61d 100644 --- a/libavfilter/af_headphone.c +++ b/libavfilter/af_headphone.c @@ -670,10 +670,8 @@ static av_cold int init(AVFilterContext *ctx) }; if (!name) return AVERROR(ENOMEM); - if ((ret = ff_append_inpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0) return ret; - } } if (s->type == TIME_DOMAIN) { @@ -729,9 +727,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->temp_afft[1]); av_freep(&s->data_hrtf[0]); av_freep(&s->data_hrtf[1]); - - for (unsigned i = 1; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); } #define OFFSET(x) offsetof(HeadphoneContext, x) From patchwork Sun Aug 22 00:47:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29696 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp653193ybj; Sat, 21 Aug 2021 17:49:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwwvoffhb8HdCNPaLfA3pJVipI7KbOpeycmqX0ZbpFRGE2C2nKzFhP4Nomu7KIfAv2UdKsf X-Received: by 2002:a05:6402:16d8:: with SMTP id r24mr30274724edx.124.1629593367043; Sat, 21 Aug 2021 17:49:27 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dr8si12869270ejc.355.2021.08.21.17.49.26; Sat, 21 Aug 2021 17:49:27 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=NImMfc2b; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B9C8068A4FA; Sun, 22 Aug 2021 03:48:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CA5068A307 for ; Sun, 22 Aug 2021 03:48:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QEUCZa8objeSGT8gjXm3sMwiwWCEN2Tkihmrf2jCh3wXmz3UM/NBoLThcQXibqeSrD6qaHx7RbnDFjelRXFBJ8Qv5ZO7LPx59fAJIe3vp9LGtKLA5ZXDADnThAqUdkkZa/WDW+wt9Gq9j76RuqRhxtIB1i8bLEjWf0zx0TjwFVk+EYBFcHsHVrY0VSl2S3cGrlIrIBGe4zcVMLyQQpsO5yVs1P+qbFCwOtW1WlwnT0Ohxb1GCtZ/tP0nAteTofu+ibrIu13EDPCB3HiqF8WA5kCbn2uUgof+Cv7llZOweRIakf1W7JmiwkwAFaGrssEqSz/ZAUlNxvcCzv8SCOqscQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mpvRuojKkwFLXuUhZ9DiVMRsa911WBseZYRZ1JiJZaM=; b=mpJJddJdkZxASO4Du2iJW+suSMyTZDoQRbVbwfsPl4Tpel0wRY00yzPdi/VBtPxmdYkk2GDzgmQr3deEKUebsf3SpuE7DusNWKJx4S+fJhadkvjg/isP5VczN2eaz62BFZNLoC3i2d3ffGf72GYHfw8rJmgjo69073dhS+15RLai86naLb5V/qq/y3xGAcKirCKMK5cs8QXouq5p9oHjDSY2AHUWnYtEJV5zZjDeqJOY/n0bLoIONUZ4bg3CIjHjsK9n+86udzh/urmXri5krmOfX1sqcM1cp31WuJQbPea7mN3rovQ+6p+uUFtK10fLWo+eayXaGZejJ2nYml9s1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mpvRuojKkwFLXuUhZ9DiVMRsa911WBseZYRZ1JiJZaM=; b=NImMfc2bQhZ/2GQMCh+vyBG/aRF6ApBiM92s35YlsBUVwOkURNQcT1r/KeRnZPePx6YrAdv99x2ZehtviOiGUxIU1dW1NO2ZTwjFfUV1K+1IVneLQSOGkUYL8WrfK4F5xgXhiIWgTdCNVKpLgcCay1dvOkmrsZt2t5CnFeFTItkTAcOMgkdiBCY8SO510mof9pT/of3l+dbE94DQUHo+qnG6jX4ixxhrjKrevZRaxTufokmgMN9pPerhU1S/Z0R36NOkrecqoPexJ2nvRxrAvJHDneNmSfjpP2IhSD1uaTY30q5EVnAfPWpPPMl6MjoeGScicSfShujJiJIBf102Mw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:09 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:37 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [vLbocW0ajBcW5bjxJhJvus0e8guNkdFz] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 75811986-d01a-4f00-b134-08d9650682f2 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUPHJiP61NwviEKWmldPD2hOMrq7iUo0JU8QzgWUblJ79r2bFDINid01g/hrQ59mruOEOEtT28g/vz0nReX3UbqH/k9Y4y2mDNVa+tv0mAsFpeK5Zf34NmHV8Flv/hyKO/VZBq2mhoJH5bpCel2Ty6SoBUySFRvZ0lQPGtCzVHtlO6p5HzUMQ6x/zg6xfe3bB6wrRkGj/WEGyLZVey84ge2xB33Rg2flRB0Fkeb4/N8dVj4bNVqxS7JTIaJa+XgZIR4h5IUAERjcDPkBQ244JBM3548I4AdcAkjmF/MbLqa2x0BREAouELBGbi2S/aqsJY5Yn/x6YpQuCkbj0ILiGsWiz3IX17hgbKtl0KQbcQvcRe1rrPXbcncKYAGbLhtA5yPzXApdQHyUhQ9A8tZvtWx5aTB/b9WVi2IRAVjHhbRRSzt46pnTviUX7RTWnWNQeZche8/ZzcYAWFvN7WRITn4YjieCpHKnAxWqQPHsnwjkkjqIJ89EiAWT3UDMIXEsqL+fbbj4l6twBUxeWuifo2S6aesmtaUS2rUh3UvorhIlZu5sO5C8D+fdOxm2H32vdXCm33WAyrrgcU54/qXy6J1bHY+iKUZPMI4dxEz0L4pIH+nywAM69Eh0DvzpcWYCxR0Nk/kvlxWQWyiDJLGgVM1U1N2HofRve5HjKvckomF4AjT9IPWvzSD9pAQ614/TNRHv2QgdzVWLOBI8voaL0uOsOy1DFWmd9Y= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: r7P6hK94nhKjHhGX+VTTDKiPdG1EzhXVK72sEg58uAID4efrGnf/2OOIeUbDHKV1aMQ+OYXQF2/jSenTywmYYg5gL7oxZLz7oJm+9lnNgKJhsj3s/+clqCn4LaSC6Iss+dkDyoGuPyMTBSWuTsn9fietPCZ5Zb03pGjeTwVR48HAd+QNkcP3VgVBurKKLbAysUi2dDapWSag0/IGs+zvfJ2zTisJ0GUqsmlwB7wwfOB1Urae3We3Jw38pFqjBFIJrnX0/jgD6CdHQX5BNk7wx/+xgFZf3KBdYCOLOgGvlAHuIZtbch6JeRCkSL1aifXNJPAdT1z9MX/p1uObFKy1+ZX2NCTUk3U51IXlDR57zrt0AwSRn5NekvAKIjfWmRw6fXM3Yp20EhgIjJRnXdaFePwDoIqW8oxbV3JIINUKgig/crzxsTJUYOhICaAEV6Uo X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NgK5hpL4VT5h63ArrbGtDA3XapazDrzw1DlYboFfUHVdIYu95jLL9DqGti4KM4UjSWvDd0xvC/ckrG7Hm5sXm/37+S/gk9kL5/k2z0eaY6Nji4tZT0vJXvl15Spyb3G5PSjrT+aUyrbl1jIgr2ZARg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 75811986-d01a-4f00-b134-08d9650682f2 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:09.2958 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 08/25] avfilter/af_join: Free inpads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: sXZK90NYpRhd Content-Length: 1234 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_join.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c index 8e57dfb8b9..c8e58260da 100644 --- a/libavfilter/af_join.c +++ b/libavfilter/af_join.c @@ -194,10 +194,8 @@ static av_cold int join_init(AVFilterContext *ctx) if (!pad.name) return AVERROR(ENOMEM); - if ((ret = ff_append_inpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0) return ret; - } } return 0; @@ -212,10 +210,6 @@ static av_cold void join_uninit(AVFilterContext *ctx) av_frame_free(&s->input_frames[i]); } - for (i = 0; i < ctx->nb_inputs; i++) { - av_freep(&ctx->input_pads[i].name); - } - av_freep(&s->channels); av_freep(&s->buffers); av_freep(&s->input_frames); From patchwork Sun Aug 22 00:47:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29710 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp653076ybj; Sat, 21 Aug 2021 17:49:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx6jSdquHXfUAVCvETLvj1R9/QEb6E6Fb0QfYrip/J4Co3py2lGF31PoudeY97S51KRTRvk X-Received: by 2002:a50:a452:: with SMTP id v18mr8950455edb.17.1629593348784; Sat, 21 Aug 2021 17:49:08 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w4si10230009edd.400.2021.08.21.17.49.08; Sat, 21 Aug 2021 17:49:08 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=eOwt6RJU; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B7F6F68A2DE; Sun, 22 Aug 2021 03:48:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 143E068A2D2 for ; Sun, 22 Aug 2021 03:48:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hsd+hgtNa+urtebWGjY05Zj8qdJ2QbTQowGFqRw7FbxTMJmUoG9smwhgXcbgd1YtZ4fl2hteq0o1FBdgKIi4FD3dgloI8mGLp5m/fs8TXdZG/2HguW98XRrDQ2Hr1GBkuWaSeHDwHzS2RhvUrEJHTbFOryp4A0tASOqrrTKjVrBVOab5uqldEEB8d6mHluEs8j+j5H4pSf+91zqTQj8f9XRIrwa+4ohrJkihCOTM2qz6c7rm14ZoM2Zn4agsevnViJz/AdvM0XByS5FMNK3kdLuaMkGegpTjDCpK/a+cSqn6GFNYehSlRIBSpaelgRZc5/pSA8Z0hRzggBUBMB8p3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=weFiBHVhlzIaaKUQZK4lmoNoesDCfSo5xnjWS2XdThA=; b=gGmDCCTXQiqWXNTuEWq6XT0p1GFlO8g+gAPjM1akimNunvPN90Wy9Zkt1w+DNux6Gejxogo4Vd1JyuBssp9vDLtPE8B2qnnrlnIigFfbuRaAla1wgyr82xuPn14KMNLA1GsRKir5qNeaHak0eaqQmuNGCZSBjSA3wkXNgXXREt70CqaNYJNCyLQatwV1QpXw4U5r58qCM9EwF/Ua5k4WoKCzQFZQzw+v2LPwkm8xqEHQL0xXFWcwYUD8VQZ5tCak/fKjwabdUL2zYRKHS4wZ8sqAXizWfEhH021O6XF3ZwSo9pYW56RyH1TLDzqcuC2VvX9+GrMrrj/WZu6adL9cTQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=weFiBHVhlzIaaKUQZK4lmoNoesDCfSo5xnjWS2XdThA=; b=eOwt6RJUgo+VLW0ljFtlceygwDr8RW38TgXoYRx1+EBHReg/dAzyG+OVu61PN6ySiOxagEOAum5Rr8VFbqhej39PwSOqbPSM6Cvgt+qzBSuS2BQ56loHarEdeZ6uv1lfxuKTYfEY48tobMZ/y2c3r6wcfnNob6ti8fDdU9ncj8SOS/splsg6cjX7K8xHxzHRqlBDsK6OXqQ7JdTFVyy7BP/28EtwfuNAxga+kanF01VzzxSYQ0aIyuTP4x6/kQMVKgtWunUBF5MOSVyAfeLM6FoBYEp0Gm750hq+BKH6apRhcwLGk1ash9j3Kjl9V/p/htPWrZHzizx9qmC7++Yxig== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:10 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:38 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [pGiExpzdYa2D/eeGZ1Z7zwRoWybe7Y3R] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f5b005be-1805-4b2a-7b53-08d965068370 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjyIFK9326jWSrI31hN0hMqs6FdWNJ/48/f51x9AhiPfKCFcuiWh3XwjE/3eJL1o/axGGNx+qlJWj+X7sQHgwGBlAPJfdJm3eKzMjRh793Vvrta9ODU09cCAo+qRav6TyaDZ2eXDPC7ZA2BGscm+GkE78TYfUsahUnIvnpIFQLCpAptWSYL0QMTcTPKEJr6J8pHX+mxOWH/CEPoc0zdfhA9teVM+i9kWHccMOeBG55LZw6649qvRE0qB5vO8oJ51IhggYHfsxLFbiOnPJHPDAp6M74McnQhVaf0slKFqYr2yjJpgLDT/0ryLHp3cL8PZFO6Sxj8o/JDtCJCUtytraCFXOj5QWKcJtdyHmpU/FNCktKlGF8G5h0q+GtD+1Qh9Lcei9hyIorsd+pNQKg5GWHuKHdaaLFFXpszOVjht/0lsiNuvNHg50jiRxmUmLVvDrWRUfhi/oyMQcon5ww11a7wH8vI7IzsxWpVMCoMGuR+Nrh8cm/vss5oCKfOLGMuH34UcVbqQNjI8x6CHIf9dk0IMAp3lizxFF2q+E88yhynM+ZZvixkBP4wuhQSRoZ+IUGrUO/jAvEoIi52vAzhDl9yt1upriM0vmRMo9VnkHv7+owweGlYS2+aaEriQYDk2CQ20ZeIDQzLEX0sbsnoSZhtR+lTmtBd10l9GScKMz0fO2FwWViZMYm8CmCE8643MuIT1ZDEdFWFwWY7B525lT7SNIE5c0Gbiu1bG0gAQaY6WvY= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xyNBI+VkAQqFPXXyGiWoey63gyp8F9VrZAxMwprsz3Ko7IImZokfC72DFZcykRh3l/FeZDbjv72d0JDIaFDJYMFJemDeql7EJREITB39OMFqFQqdGAh8em8OfMjppOvToaL9d7X5gEisRyXJP2dTy9avLmwHS+5Lsp1TH0G9dbCjozaBeUsNkfEf9AdoVOr/CjgKy+p/jCd8XBQ6YM5rlF0ZEauz06RjdmtSJv94SB5fNR0pKR/avu2mwXGqFvn+V0ashZ/pxKFgbmkIA92VJjobt4IhJK2mWpuQBDNgEmAB7VTMDVmYs8WfIkrY9Ht17x4WWUNQsJsrOusM5iytxY3P7jVxa57VI9BiQ3EZsO7zfG4HUaLSuVjkfXb0VHkbc43CqCarE0+nzEF/exKEioApqq/+YaGOMSiB99NgtuUi23e0ny9fc79ovpNRT5h5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vT/nUFg8N0ogejB7aV5xeijd391G5IvQAPf1J/232GZ5Iab798vJkynWb8MiyuP+yFyIwER2zp8wBkPa66qMlj8l6In6q8PKIjSVOOXCBfmDbKzVNtnw5OHfVSj8Qie/oVH5Fe3HGIr+OEtkZhGGXg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f5b005be-1805-4b2a-7b53-08d965068370 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:10.0784 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 09/25] avfilter/af_ladspa: Free inpad's name generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: ossccwr9JF8J Content-Length: 1642 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_ladspa.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libavfilter/af_ladspa.c b/libavfilter/af_ladspa.c index 9186b75957..73cbd288c0 100644 --- a/libavfilter/af_ladspa.c +++ b/libavfilter/af_ladspa.c @@ -456,7 +456,7 @@ static av_cold int init(AVFilterContext *ctx) AVFilterPad pad = { NULL }; char *p, *arg, *saveptr = NULL; unsigned long nb_ports; - int i, j = 0; + int i, j = 0, ret; if (!s->dl_name) { av_log(ctx, AV_LOG_ERROR, "No plugin name provided\n"); @@ -639,10 +639,8 @@ static av_cold int init(AVFilterContext *ctx) pad.filter_frame = filter_frame; pad.config_props = config_input; - if (ff_append_inpad(ctx, &pad) < 0) { - av_freep(&pad.name); - return AVERROR(ENOMEM); - } + if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0) + return ret; } av_log(ctx, AV_LOG_DEBUG, "ports: %lu\n", nb_ports); @@ -750,9 +748,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->octlv); av_freep(&s->handles); av_freep(&s->ctl_needs_value); - - if (ctx->nb_inputs) - av_freep(&ctx->input_pads[0].name); } static int process_command(AVFilterContext *ctx, const char *cmd, const char *args, From patchwork Sun Aug 22 00:47:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29706 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp653110ybj; Sat, 21 Aug 2021 17:49:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxqPPIiphGTpJItISEpvKrzeY4ljKGsdzUWZDuNfRWf6VPuB1KV07eZvr9Pir+8b3pRNMjH X-Received: by 2002:a05:6402:1d05:: with SMTP id dg5mr1440980edb.375.1629593354800; Sat, 21 Aug 2021 17:49:14 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hd14si2425958ejc.282.2021.08.21.17.49.14; Sat, 21 Aug 2021 17:49:14 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=rKl7d3mL; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4502068A4A4; Sun, 22 Aug 2021 03:48:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28FE668A306 for ; Sun, 22 Aug 2021 03:48:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DR22qb1z9hq7OgQOqLkYC7NfHcg0WZuMqkhwdMDERrrE7O5PHU5v0UCBqKRfSdcH8D6LOPrwzAUxFSFZUKEu7oY0zzThc2QRxXpjrRbxC5sfHOrBmvXP7qReBW/0xC6dgFsQ8r/ZI859wwZLqSR5Asjn8OR42MIDCivH3IeB48WiSUskAVUmYqjy8p9KGIZIi3uuSNYzNuk0MthbvVOnV2n2qIVTRaGbtjAGKe+SI1bJf/eRlKxO2NBjGKPKeXKp34mGXkCG/Dg/waw7b4cdWiWjcE6T664vFjhvyELOCCk0CnU94sv1PpHAgr4Vc96wjFY/t4LDlIT1vSNZrGztmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1oyg3tDtwEEjQlM5KAkYAovvRR0glIskASiHipzCppY=; b=RowdbdG6NISv2/44Gj2W3/svrAuAC8vbo8UFQjs/1DeTpb9FIY1ra9INFNrAEv8iPYrybYQgHnEjbjX1WdiuQNWlQt48PYN6cvER0mp9js+uk6PCTuk4qSvmpbAP4sX+ZTZuf/z1NaOgr6nTHLc2JBVKNfGCcC+O8UkM9x9rICl0BUbh/sOa9v40XZOh1kBlOnRJCLiAtVRuVKJQkPdP+wpKVBb4DUaBOFGmjAL/pwGRHgPyulXg5P2tSf1cDcgntPctwsS+YcGWfCJU6JyaHTm8NQKQys8BWsEY+q3/8yhfVXjlDZknxoK+TlRwmgP+70t3Un9b/Ajg0uXXXVW2Wg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1oyg3tDtwEEjQlM5KAkYAovvRR0glIskASiHipzCppY=; b=rKl7d3mLrupBtNhhFmM6lQ7tS/lGQrzALuMEgsYjaCgIaybyBj1WImsJbe6p6we+uRrYwZaPtgjgJPCAiIxiDkGFJJhJOXLsuH8QxgLqlENMV7tzgehYJ8cJYB+qrwuABWg63PZgkUh+vTLxCHCAZFpinNgclRYeP/N1K1xG3F3dZ49kTNSie0U/2ONIHFNH3kvks9cD6ggmbPeOLcdNPeFDojilTeSxpKPNFsB1DViHV9brFdcweabRfVxEPcFi3C8kcEZCSTgIpWfgw224j7MlEBqzQNl8quy/w8jLGfJKuVWmhgilE02JUApsYU+pObgEKM2AHxH1rwUlA5NY5g== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:11 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:39 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [zzLtMISrxpfRNxbI2HLJOMZbVzPY+U/d] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:10 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 14598026-2823-4b33-dafb-08d9650683fc X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjydxoobFVnA/Ae/upBQpYgV9PItU336iACI2opzBg86RHU+GbetMKSyiNy6LRKMTYuFaokml+0J/BwM3RX/NmRfLDFtJD+aq4b2SJNp+emnJgXljoMDH67L+Kxh1lL2hTq1jswo1xcrnPiGePUFWgS7oIoywVTqSn5HwMIIPJmFoLl4z0DHMw8i97zpS7vqCZv3bfZyiNbgkn3NdeStKAbMtxZYNGjGsdy6inRz7KKOX6rwbFrGIUeMkM8/vjWSeOX1vGWxMKV+J/V9yXUEo2rSw6/xcf29NzXjIrz8mNcYnBoAifltwUhAkYAWD/cWFOjhbfihPF0Tah/+YOTxNsri/h1/5bSQK++tTa6/8PrtBE3mGlET0IMHgar6EzkGuKRINchXksZGcJRTk1RYpv0pwRPm4+xBoF0tGOfCe2vZDmyZ0mzS3TaKye+sluihCvRfY7TZ4f0nULpjh/oz5xHf5f1fm8Zq7wfAS9K50Aztt6R+TXeAKjrZMjNRxUzPU4SeuojsaCPfZHRt89mN3M8YpQv+uv6CezoKyM5iSu3LExCrr6SmmXy51mSHpYE4QFYENgNhVxKxm4FRf5N4LrbILyXKJrQLw8C3kTqpaBlJ7PWkt4JtzgB+1lfZIkZxeQMdomzhO3oGJeaUM4FYxgP2Qj51VNZiomald87B1S7/apF7HkkwOybJOVPFhHT7iCP2C5xlAy/IIBSaZV58dBzE/dw6RMVNnvu14jlZweLil0= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oePEou7AxiJp7VzwjrwhNTHQg9g7iSikFEJLP4XBUvExlZt0K6CjBy9I/zBf8siU71H5oTUqi0oAIpccVVFKyV7UUzXhgxkRxg1VJIwxeawSooUNdwkVgip9pixbOp0tgFnrMYwDXbU1VeFj23bdHifW2WimhZ1tzjHd/A4p43V0M/ZjUp5+1kPoJYh4nBPwsEtfZo2WpZLoVMlbCMYUDDqp/L3GitSM4uAPCpPg6HQ9LK/f0kNOafuTMBDPLTS1n4clkooGWqkah6C0guLZp3LraKNfa00d9NUD1uoEirxr+qQs4TUtpLu+27gD/kjfeRSfS+mRvP1RBPCSHW3EdNqBb7EBFlJziQEh10w0ULOD5CQyZMrKwk8Yemjf1va3ln1/bbVUIuSHj+4+5CTcXx8IUseialBMlaR8PMIvmA+d7w8xwWvECGAdbGjRsYkR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9myXUt4mnWS+o6UP1vO5zCUh4kE5HuG38NhLk319oPxzUEFev5/IyJMOYcvMSeBaSCOl5QxvM4CCKHSbipmQybE9gOextRUwtkZpkPrjT4bx8XX3fSOD6FpKwcgV2MTn+IK1yop7bkuE2wTGjrEmzA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14598026-2823-4b33-dafb-08d9650683fc X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:11.0342 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 10/25] avfilter/af_lv2: Free inpad's name generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: PoJhCBsr5V/8 Content-Length: 1467 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_lv2.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libavfilter/af_lv2.c b/libavfilter/af_lv2.c index 76a289434f..75c7494cc8 100644 --- a/libavfilter/af_lv2.c +++ b/libavfilter/af_lv2.c @@ -393,7 +393,7 @@ static av_cold int init(AVFilterContext *ctx) const LilvPlugin *plugin; AVFilterPad pad = { NULL }; LilvNode *uri; - int i; + int i, ret; s->world = lilv_world_new(); if (!s->world) @@ -464,10 +464,8 @@ static av_cold int init(AVFilterContext *ctx) return AVERROR(ENOMEM); pad.filter_frame = filter_frame; - if (ff_append_inpad(ctx, &pad) < 0) { - av_freep(&pad.name); - return AVERROR(ENOMEM); - } + if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0) + return ret; } return 0; @@ -562,9 +560,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->maxes); av_freep(&s->controls); av_freep(&s->seq_out); - - if (ctx->nb_inputs) - av_freep(&ctx->input_pads[0].name); } static const AVFilterPad lv2_outputs[] = { From patchwork Sun Aug 22 00:47:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29703 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp653241ybj; Sat, 21 Aug 2021 17:49:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzpREJJda/vY4eqMz6Teqag7xONubI6AA+TU/XAxLsZkmZXQ93xaLG2ExPWGw3YYXH2fc80 X-Received: by 2002:a17:907:1b29:: with SMTP id mp41mr29173080ejc.459.1629593373486; Sat, 21 Aug 2021 17:49:33 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t22si10849870ejy.236.2021.08.21.17.49.33; Sat, 21 Aug 2021 17:49:33 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=J62ncopp; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 325B768A4A8; Sun, 22 Aug 2021 03:48:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4041268A2D2 for ; Sun, 22 Aug 2021 03:48:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=foMiTTbJEX7qtUFBx37iC9LGeh19OurfS+rbph3DSzIawKDo3qS5X8uKzdyRaaVuPkXv3fkpC6d8n7Nfsf8JghrUklxkQQPahu4lXmzYjNdqWPfcK3299bK+Q6zrnk7XbdhiaHnXgi993eupPee1L6S1OkziIqzSiPf2aXTXDzd/cyRFmX5zqG30Yd0b0+rvE3eu2cdF71wLmcIh6/EvVvDBdNMTcE+4GHezxH1N3P+qNgeG/7REbvTFmWu/XxkktFg0lsTQ4EQheWIqDAMzFe0VFM6jcnp97JBMPtJ2a4JEprWt3x215cUrHs3tKjV/HRNi9TCjIEC8eGrikeRLLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sNql+QFcIDLVOZiZ68nBnRfCpBGpNMqbtzggUWkMItw=; b=SXvVPgg6ud9Szm9EstniGPbXkgMkKj8uEMHn/0HXu2NSYs8tMxy4pr26QLAWPOuuiNdzK/+X3bd+8y+SkPLGyVVilTbUzAKZaHI4f440V4Ic8z968uZtNvKNDFs2yHCEBzS91HpUEuXAmI/ZJ+sXJGfjCL1EyMdrvfX+POHx6uod+UU4tEkcAVWc7pwPay2zbe8YYPmq2ykReGPpmc1vhZKTEJhjvy8rdkczOHbOwqU22uMQl9+hRscZpLgEEvvXTl99yqdM5sL+3iYd1JDCXhOYXConDHYSvr8sbcE7/tE8MNh1rQ6eq/I6hAWfAXNNNzh0B524YGSz8uoZsjelWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sNql+QFcIDLVOZiZ68nBnRfCpBGpNMqbtzggUWkMItw=; b=J62ncoppEoX17BRoD+eiXGTBOsgHzdvgFujfCLwUfO2SS500RBvWiHX7zrzTe6cl2wttK7TNiF+mlsqbWm7cfQf3RNdBHGCluWwE0m7oUqjG2I6P2JpfYWZgZK2w3AD876BVOkDPpab+QhBlUL7Zi6PeeRAYY8wjgbBud6lnFkBPbPSUcbnaHIHmUY3LF8qI4U+lSbNocsV9mqIvVVjjDk0r0v5NU/BdHVROCgNhdATPat28PieTrirKEd7Maydq1kcs1iw5xOTaIlw9ag6L0UfNeUifFP/e7mdrHo8BUabAKLt+LSG2/PHPXEdJ8OSGPihjRQf1MpVPwne/YedvYA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:11 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:40 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [wpf25QcoW8ONB5QUxmTFXu8vfPTGjFP5] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9781b585-9c8a-4a64-91ed-08d965068480 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjyEmRrECDLydhKoAsVaS4MorYh8kuCA2WAXyHPjnAeUH1nTLnqtfygpkgygyP3ooQs59RJMfoYKkOzvSfU/lbk8+43WhSrIQwe7417PM7SDJ7UVX4RczwlPX6DQoBaljPu7IEjtfx9dF4Gn0JdgMmUwB505IorUI4crv7vsQQ0rZybhBc/5VMFrbZWClj2ySmiQHRKxzj9WT4DMBrBm/xpPA8LgB86aO7tVd7kp8maG1aONimvumjHWYMGYEv2W8vkKiKMwfe4LiKlHheHX8YQkMSC4SvkBvNbJifC9LEg+/FXSzEWtUT0i//8yeqzGKA87/nzghdM/Zj9lNk6CyIRKKPjtxXoYx32ohL90PCJaGqO9CkAKlyXM7rOcJcZksGee0oE1X/7X0krEKlomv40k6PJyLzZMY9CxhE9dquMqMzPjN7jI1fn4B7ezvM34LJIe90J9b9QY2Z4IL96ILaOkqewx9CT0/ViMwvAnewy/kL08yt8lvc8PFFFC+T7gUcv3ho//VAVTRFJEjeuE2kxVf3s9HFEdX6kgFdBcGo5zZv4CK7fdvOehfznqsIBygUlwEiBiwEBuSXiYiHCfjyC9LvHiHNUAGBUtVoYor1C/HfIU0cog2gF4MqdabLncuugAIg2C2qxHhYoWlR9DaV+txvckIiMG1PpYly+twd6ptAXaE9R4Pdz9unEtw93eZ8c0RX8QmS9F3uv41mLNMo0w/bUUwJYy/U1kIEFipySywY= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ud+/urFPZ9Ifh5eyKgeMn1lAIpq5+Tf3JG62747SdSxngefg+rEcJQmAyHMqx/rRR7GP5VqFkIbasQvNfmaR+hjawyclLDA8v5rWjwXTqF48/HyaJaTHF6IEUrqcCz74NaS1ZVSIiBX0KkjByWUammUX20Gsnj7WE5doxNlRnNNB+z47b9HR0nRIF1OOBcfZ1FCnV2IV57L7Um3B6sq2jkpq6X+K43r4X2f9/KHCcDkE7D8q2F3m6LyZv7+5GMCl71H//caGd2KG2Ox3yxAI3G+xkLOJVuzFu+KVWg4nsUtzz+XxQrrpZFGqZaxyEwRdQK1O25TmqwIXuTNO/TmuYrwf+m/puFfWEY2S61f1r2pWGO4dT8TZ4dZjLL6vVyBPFO7FFz76uyXWdj0n+EGXPZMY7wxmPzfnEYl+we+Dx7EXXHtbOwE5rXEAqKJnKjzN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9i/INbPgoYX5B8oGvqW2gL4TmA23m6rKchkUmMiuG65F9QAUs3OlNPln2C96oRqLl1o0mZHKpeSUaprME5a1fKSXd7c6YLz0ghh/iF5oc8KHSOP6m+x8MSNZxr7rh3skEC7HxfjB4hpwCZT/HbHtHQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9781b585-9c8a-4a64-91ed-08d965068480 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:11.8675 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 11/25] avfilter/avf_concat: Free pads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: pca/9mkrIQxo Content-Length: 1891 Signed-off-by: Andreas Rheinhardt --- libavfilter/avf_concat.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index 10f21cecb7..2ae24e9b39 100644 --- a/libavfilter/avf_concat.c +++ b/libavfilter/avf_concat.c @@ -319,10 +319,8 @@ static av_cold int init(AVFilterContext *ctx) else pad.get_buffer.audio = get_audio_buffer; pad.name = av_asprintf("in%d:%c%d", seg, "va"[type], str); - if ((ret = ff_append_inpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0) return ret; - } } } } @@ -334,10 +332,8 @@ static av_cold int init(AVFilterContext *ctx) .config_props = config_output, }; pad.name = av_asprintf("out:%c%d", "va"[type], str); - if ((ret = ff_append_outpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_outpad_free_name(ctx, &pad)) < 0) return ret; - } } } @@ -351,12 +347,7 @@ static av_cold int init(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx) { ConcatContext *cat = ctx->priv; - unsigned i; - for (i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); - for (i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); av_freep(&cat->in); } From patchwork Sun Aug 22 00:47:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29714 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp653340ybj; Sat, 21 Aug 2021 17:49:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQqmiTuK2tGs2CposLr2yqq8eHtdCMy7DK7Cs6OzX55ohdDVmb0f0gr4W3tB2i6FNYhqa4 X-Received: by 2002:a50:cdcb:: with SMTP id h11mr30578229edj.366.1629593386607; Sat, 21 Aug 2021 17:49:46 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j4si661815ejm.726.2021.08.21.17.49.46; Sat, 21 Aug 2021 17:49:46 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=t12XIWZm; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 77D8E68A331; Sun, 22 Aug 2021 03:48:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D70868A323 for ; Sun, 22 Aug 2021 03:48:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WlsFc8qGnI40KqTXDlJnoIj1Hgrz6EOnkuAc2ZogOuzhg3Q7eRKSEBQ6KzI+bvbsXQBNHMgAvZbOCZjQXDij5R4eYs1XKYpeOErNR2txpauUpx/G/PIRAgW1Ekn4uk2kNQFxCJCRoqDxPkAlJp1MMbohjb8JJYXqYtl5/S9xFmqqJioSPebTAaTSzkgDh5ScRJwbcfjl79f1Ihva8a/hzkD6oASTM+7h518rrQLyppRHdLzYUyTOFq+EbANzA2XNFMJMHivlqc0n03nU7OcPMxuVsTzCCS/dKH+KMR/oadl5iw1bdzMmmOQqRGkwr+Fij9gEE+RnaECus7avp+ju5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=t5u05B27uYIbMYPBah/AHR2C8ZJoFc8Z95XOQAArtRo=; b=hI36wejc0HJbUUi5C0LIKrdjvfVOU9G4pPAEke1iBXke4j7hlkVCWGIBn0rPWLaTLhpE+nzwSg3Sgukg+F41xG4Fe5GYyb+RtM+rBuFHESybcF74eFk6u+MOj2S/ziE1Tu7VRQr/4n/2Vsw6YEWgJJI9H+4Ztn10DpKrEGbDJk8a7piy+Z0Y2bnO12U7usjlJmqVQlhh/PRedntyEs/x+I3Stve8JXOQm62IsQnRxRB+ytcGYwnep5UX7eV1Gqmn9Rn9l1wQ1EjjNRo9saQC6mkUBS8FMqjpDjT4qj1aSd3QELY0HLIz0tpGnFUwCS9h43OidAW4FpfBMLkLtGzfyg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=t5u05B27uYIbMYPBah/AHR2C8ZJoFc8Z95XOQAArtRo=; b=t12XIWZmMgM87KYPIKJGgRX9Rq2oRtNVp3E6PIomF1mM5mf3yPlgVrVlEYpEzU3KBNlJrKfn0OfOD4NHQvWDZg5TzCcxaJFjo7V4g31DKHHUGM1rlNM6El72Igujp2ZIw9C6RvenKj7EN0viHAwv/G97UKppiFbnAYzgm841utJXHm7oBPxCAEWrShOH916HnsubjiaeriFjYajzY4//UZAQw0fAcFADeKyhKvdGLkYP4FZ97wUI2EcJtkhigUpaa3VHKknTUy/rFs02YBEvJ0/ObVtMNGilKjCBK3AnZP8pfSGAAKht5DnTZjHq4y0OiPvis5fGMeUriY4I8SSXSg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:12 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:41 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [O2E8y8JMH3C5VdFhvBCJyzJWAJiMYepn] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 57454c38-13f5-49b0-c753-08d965068507 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjyEmRrECDLydg2nymMQx9ev6cP5DgCH8gBz7hqC+QUzC/1hX5lxx7shTJSnYmO6/1Ekyhe8FCn/HO5P2ZHOXG/f6JpUAMJG64ChEXuTUsTueMACM0KOy41G7GEVwCdPpgDU9mT63Xk3WxVO+HckZJzg7uSHUG7kNZt8bt8976OWjVgrsvnMxX3UWm9eppJnioD4m5bzVVIcy9KZSaLAWwIls+C/3YXfsqLhMaMY+PRMcR70KSKlWrjuaFrrrovOCx1zKNa5Vh/idTEcyOa4ZiX03cCAURXnOaWpr2hg7oYeaAn/3lrFYa9mnIb0bY8Q8zqVMlMmFsqEKz5Vy3ZHqbCfzRj3fY9stBU5HT7QRjWYfVgmWUSDsDUYGwyTrH/14F4lJSiiIm6NZAnm1hOppD16lV2f5Z//+PiNVVC+NlgRH+acxaF9J9U88YiDyeLaU9Gm8p/KPv77+aAE36Z0c0KqlRC2GSIVjVSyu038wVZPIbihL8maexK2jerlXKgXbyw4mtu6rbhEF0uvQx+bVQAJDlbszsoHSX3lWewWSHF8vGKRXXVqLGHfwbKG2/PLHChoiIzHmTxl1RMzArfDgpaJJbjSbttvljwnxiC6ns+C23ppvTyMHPhtRyiJqxD2r17YfrhH6t2dNS5gwPrpOuhThmXe7a9u0lyX29OT/uWOArMMsHk8NNQUcNrm6RY+oL0xyaONgBSxJJfwTD54bt9z9pGEVq9wf2B7JI04JAZBnQ= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GtXlxiM1YZ8ZbVqtTYXCbUQojSN1qm/ck1Mmam/bNndVspcOi4UfWWQFDKpAlHe+kbG0dmFIPYXYd6whBQqzysLy8AqF3CyCia1UTZ2KqU7wACm3MdmJa4G3pSy3tz927RReErMDPb6vmUF9ieYyjH1UoZmJaDLN8PH/WeQ13uiBNJVwMLHBsOFzKjQ0bzevHgwzxHjZzMMzCbUdm9FexM8dlowTMBMK3v886qHlCCpinwVZNI/NntDEHWP6YV3fuXUJEi6GdTUnFZ0FD9I1bh1M70MlBZu8bwiKW7W49LSw2rozc/R31zVGmwAk+QOZ1usTdS22TvRmKPq8bJ+T+HtdTmM/3ItAZCXL3hA/bhxco6BJ+vZk1U6+Uwx+Ditxe0nZNwdorpLyPBtYalkBezeqLnXX39XZbCokL8q6iVWrCrS+9UnzyUtZS2hn1tBs X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: h3/zIPPt2mf8Rf4XybJtWpe6D9id5kMGbAtLZDRoFb2JHnyLjC2iYxhBld7y+Nyvbmuyk2RuLi1o3pZgALmj9eYKOEptrt3CukrBYJRdH6Q0Qjxqc/IarfvFJ4Z2OAyMA6+6uctFnZCrnNxok7+9Bw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 57454c38-13f5-49b0-c753-08d965068507 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:12.7566 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 12/25] avfilter/f_interleave: Free inpads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 0vWXpP3rdVya Content-Length: 1891 Signed-off-by: Andreas Rheinhardt --- libavfilter/f_interleave.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/libavfilter/f_interleave.c b/libavfilter/f_interleave.c index d0c94abbce..b60e89762f 100644 --- a/libavfilter/f_interleave.c +++ b/libavfilter/f_interleave.c @@ -173,21 +173,13 @@ static av_cold int init(AVFilterContext *ctx) default: av_assert0(0); } - if ((ret = ff_append_inpad(ctx, &inpad)) < 0) { - av_freep(&inpad.name); + if ((ret = ff_append_inpad_free_name(ctx, &inpad)) < 0) return ret; - } } return 0; } -static av_cold void uninit(AVFilterContext *ctx) -{ - for (int i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); -} - static int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; @@ -242,7 +234,6 @@ const AVFilter ff_vf_interleave = { .description = NULL_IF_CONFIG_SMALL("Temporally interleave video inputs."), .priv_size = sizeof(InterleaveContext), .init = init, - .uninit = uninit, .activate = activate, FILTER_OUTPUTS(interleave_outputs), .priv_class = &interleave_class, @@ -269,7 +260,6 @@ const AVFilter ff_af_ainterleave = { .description = NULL_IF_CONFIG_SMALL("Temporally interleave audio inputs."), .priv_size = sizeof(InterleaveContext), .init = init, - .uninit = uninit, .activate = activate, FILTER_OUTPUTS(ainterleave_outputs), .priv_class = &ainterleave_class, From patchwork Sun Aug 22 00:47:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29695 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp653383ybj; Sat, 21 Aug 2021 17:49:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrqHrhZ1N0M6tKq0WIJaPdemBTfJ6X5XyGR1mpVZ0nzYRsHMUAeAxq+2pvXyC9bN0Xr811 X-Received: by 2002:a05:6402:1395:: with SMTP id b21mr29413258edv.119.1629593392690; Sat, 21 Aug 2021 17:49:52 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b8si9516062ede.140.2021.08.21.17.49.52; Sat, 21 Aug 2021 17:49:52 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=q5BaWpjS; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D540D68A544; Sun, 22 Aug 2021 03:48:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 54AA568A33F for ; Sun, 22 Aug 2021 03:48:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Aecmp0OL6T2pedIdnEJq6Pq2flxfsEP+2ZtaBC+5YaWp3EqKAY6dSB6tMgZLFdT4KpimSwnfVGaUZNq7iffq7y+A9BF+m8m3+kPNsxdSMFFGZ/TPU836lwbtYkBixlCzuJj1jodPWcrFeDs7jubvZ30yqIZYNxYAVV0g6C3FIn45XHbSB4wohq8b5ER0TXszEIbbarliRr/1Bqw1e5p7e2qm447ybrdUxpvaJ2EoWGi4rUrYslpJB4Eld9fkq/oUM332o2VtsZ7Jr67e9FM1iGhX/UYtZn+YN06QJB/Cft0Qeu1hE3Dk/g6t6VDXLsDpR7D4Hcb6SF976uf/P7EYxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0K4/zXwwECbzNCPTycxTThHtPtbUa+YpDE+ic/GPrBU=; b=MHePOSkRaCSrxdxJ1Q0ljkmqCwVZgXKg0ck0BEIxoE8jKoSbj06bVu8RRjIHaI3PZ0y5XOHT96x914hhVaKVo1gsFiSRIy9SPPGyQncWg9sLgnX/a4LXtdssFZCwHGDKKnaEu4zwyTdCudajb3HkuPxuEPuiYoijmaG98AR0IwEeSLOPrhpjeEgkvqrSfaRDOUw6Jy/pfDbJM2foMm07udFHE1NM+72NVd6QH7GaCkcMxFmGStDXA/F4Ad9A+YES4fgVAZ6SRC4BdWbTxPN9aWSRtViSM03597p8wHg9MB2m4gCJYK7WOGpqZTFB+e3Elb/61r8NF5sPC1SY/ufDxw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0K4/zXwwECbzNCPTycxTThHtPtbUa+YpDE+ic/GPrBU=; b=q5BaWpjSQJcC2xUTtvo6voJGjqDfjGR1N1xcQho/bVeiOT+Nq1jL0rO8Tan822/uzi/OeDc7t6MQ3GdPqb8slpGePFUY7tIcwSkfaakfq1OnTgn4YbW5x/wvE+4ZE08TPTUa3e99qW5x2VLeUWMqgMLcpN76Shafp6mikZcIHeC1fgKEZ4JGt8SoWvjKZygX2IxagYzLahBl/vRQRlUZPM7ySQGhvx8oBSlTIgvypaWPx0ID2y7BEPDN0wlQiTMHYSS9tftTTrjO16Buknh1T4HM85qS0MahmY+O4+NzZd4Qxj8F9wMGdMuRDjbjK+/f9JznLS/TjJ8xpi3UL5SAWQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:13 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:42 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [3I2cEOsaonsys0S4Q6G9qRTtoLRLHvZh] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: de367db0-8d76-490b-091e-08d96506857f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjyEmRrECDLydhKoAsVaS4MoouzpqafZaBwZGzGK+5qfOlpIue7SBnEUsZ53Z/dN+IapWr43F0Fvo1fLq6pZG7CmN262W/tikX9HLNoqmUD/AqCkPnCLAqpc3ICFrofU5Jq4v80D2sPj6d/zJnTR+DTE42dXbPql3lEbKARXnvZSwu2n9eW1b39YREcwaJOMGa4B013RNArdUw2b97/VRNIcN9dsyqMSZdkXYEJUgef9aS6yRHPSxAXHA2sP/Ep+VJJYWjPiJz5EdLNhWkiJeZ2rAI9GEylrNlB1lD3LzFJrb9F24eWVQiWd/YkpqI+TxicqiyypkpbmO6Wu1HNqffzKFrnQCT43tT6iaSaXu9Ly0QUW45xgZbmGGA8Ih8rz3gjmMTNheYJ/MsnIIY7Jw1e6gmZvmAIy1BOssNcp/2bDFcfL3vv0IDnVWNmgB80LcmBRnELNB2ICZLcFvsXpEyEHA5iRoAEXBEt76oBadoTs/8LWWWEAh4kyCwrzRx20VHzGxhRvnLx5fM8En70dhoS2+pn+34/36NQZjH2UzTem6TY6nYPZjn1NhnadL0p4RHOxmqQfeR/rtWq8S/MP7oDn+SJ3asCKY6c/haGnfY6Fc9h/4xJ6IVNgnygVA0hW9+EEIsaAOPeNyzBYnsuV8++BqhtnYUXqwj7NP9QBKfhAC+HrrfBSX3PoeJMt0lZT2wXbHvqfUumnCuiibiIiCi8FFOywtpql4GD+qmzj73zESQ= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S1Lbr/JgsrzDXKOZiHbSN8GuvdCUwIabVW6LKXLU/5/5XBYP5Iaz6HDR3mwsO21WdGD6csD7S0gFP9WWWSSz3E055+ymgIGJQVGXbzk5id/TeJeElU9A+u/xeuCrhsIrYx2KGa9VJb7uucxFTm25Og/+DNgPh3PJ9+v9IVxg1GaodKjSmOuTKBI1P7ZwYPONPmVnvv0L8X0fZgKUabVLSmcp2CXK9P5zR7YG0/wTMsU0m3tr2BNT/8l2SvH8knB92vfz813afXte6/HDBiCn4EgWHvEmCwXEf0z9q/o7bUfhnHCeIJyj6JvRSlCDkeB+RDjlOoYWuApsKGcIvAvi2fXalaKM+gqXapeb+kknrZCMmk/BGCQMgUpBsKWCtN1jKwQqx6w5KoOUlN4Kpx+HeR6a+esGXnnLuvjw7l5MzW7Ss/PkSWw69TGkC/b7a+bh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rwWIC99gqy3ApmwFc03Vm7F7JMbl9ELXkGLQFibJ127lvXCwPLO/YbtPg3DZcIUiJaNH4KHzWt6p5TZlktodj11ZjBBArU/JteHyTv1FZsfuBQYl9pEFPaSwQzi5oYrqPHuOsRJChwvGfTOIUxSZWA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: de367db0-8d76-490b-091e-08d96506857f X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:13.5591 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 13/25] avfilter/f_segment: Free outpads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: LZ8OvzO26gyr Content-Length: 1232 Signed-off-by: Andreas Rheinhardt --- libavfilter/f_segment.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/f_segment.c b/libavfilter/f_segment.c index f40b18839c..e9b574d5bc 100644 --- a/libavfilter/f_segment.c +++ b/libavfilter/f_segment.c @@ -137,10 +137,8 @@ static av_cold int init(AVFilterContext *ctx, enum AVMediaType type) if (!pad.name) return AVERROR(ENOMEM); - if ((ret = ff_append_outpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_outpad_free_name(ctx, &pad)) < 0) return ret; - } } return 0; @@ -245,9 +243,6 @@ static av_cold void uninit(AVFilterContext *ctx) SegmentContext *s = ctx->priv; av_freep(&s->points); - - for (unsigned i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); } #define OFFSET(x) offsetof(SegmentContext, x) From patchwork Sun Aug 22 00:47:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29716 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp653484ybj; Sat, 21 Aug 2021 17:50:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyIK7hOy+lB1VNYZBmHLfDDf+8W4oIfYS6eiZViglMcI3Ir0Naro2vXc3ba1WAFd4bRr/pS X-Received: by 2002:a17:906:7c4c:: with SMTP id g12mr15841466ejp.74.1629593405177; Sat, 21 Aug 2021 17:50:05 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u1si9786994ejb.723.2021.08.21.17.50.04; Sat, 21 Aug 2021 17:50:05 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=XBfvJ7cE; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E499B68A543; Sun, 22 Aug 2021 03:48:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6200768A307 for ; Sun, 22 Aug 2021 03:48:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZqQL6ApgiA7dtoK2QGPBSAxg7xov67kFaX94U3Ix4kbwFOv36KcSAz4S82fLY/+o/jeN4Cy4vfwineqq3K3gbHR6AnfwJRL3yVVxBXS1xuG7W2oA6Ko+Hxhe/L5un2W215ozJ1Y/OK69tOOS1SZINCSSMUCgPKkcwetqI+ZqbjLvkCx0MJUPvhxz2MuDXnnt9AJ8Pt4ESGM+jHPCvc7uaahvXJR/1s3ddhlfIex6pdp65GOGFA4wqVj+cTx88jLJSA1mB/azkCl5aQP3HcBomNiRDklcbDHvCy882UBvCWvd9uJuRo7FFcy3yJ7LwWSKVGiqZVkvzQrPhXUKrsxhhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RhNlpSvdS2JqY8U1Jyr7Tth0uNEI0aCRp1nUpzTAePs=; b=e1w1vydsej4qrJG008ORaoqOJ/E2gXPg+mesnw9oc2kK7Yv1spPRbMLKVGGzl6uZNFk4DSeJ7lix3j/DIhSwBaNIbqznd3m9K1doDCHVYgFDaCK7fLucqLx2Km7L1OClJAFT7MIsjBCOLVs8HUxK9JsrY+VSyiR+rot7Dw49KeacAXiBxakrfUMUD/TMASDr2gXa+Vl8ULRkcsetnOz34SkhgOZxwuOnK+9wDt0BecgloY+YRm3mhbetsmE8I6p692ZKcC3+bJw+9PO4A+GGoGVPwFYke6tnNDb8g244hXQYsHaCZzJ1/zBTbRCo7Li8qEh4nYJioe8rDuekupitlg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RhNlpSvdS2JqY8U1Jyr7Tth0uNEI0aCRp1nUpzTAePs=; b=XBfvJ7cEZDYiB9rq78eaXFPW+rhlxW9fn6BlWvNW9Hh5iOQKDO1B++PM9U1rDLxH93qoR0XsVHMwwJ5iDqh8mTsRhueYYKlxJh+q116DrD2Ebe3Y90R6++p96z4wHhVgXxyyo/VtwfdNOWlJcXxmCmC7I3B5QUHr3U5QPatje+YHZ7e2k9tn6nZNgnMKAw8FCASfqSleS7ItLCayjilCuy3s7e2dOc8lsIL9oGhauHSWsqRjZeRmN/PC4IIisf4KqyDUtcEuPpU3rlzxBl73c7x9xugDJsqd2nOi5Lqg3+7wKvTsYyfFreS9QXS8nzgJ8L0VLanuLcgX/OzGmeLeKg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:14 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:43 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [JkMrYKdoUMM6PLIwOY6Agv5oxu5s5FIT] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 54bdf51f-a94b-4abb-3ef1-08d965068612 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjyEmRrECDLydhKoAsVaS4MoqfBJgLJbQEjMqfzqX9Emsjj+WrHudTekPAzPkQ6+iop/A0O3W3/0DMJnVwvDG6gDh5hRubQL/Bq7QACck1LC2uF321uTPzUIlxZOdq7vA7CxB+81EJ/PUadjp73jWjJVDuXmdlVjj/C39aQwj6ybF1QGosc+5T9Lyh2ZkTaLxXoJXHmE0E4RPI8ikF5g/nTRK0ZM44Tx2Fi5Wvew666QyUP+NbCkuhj+mHYVfZk0j1VV+3HWM/2CZwCulRJVsvYIrnrYY21rp03ajZ9xP6o8H/ja2gALn1stxhIDcFSwb/U03a4zoC4A6k1TS2Ux/XA03SObYCNX9fx6LUSLtPtSZyGO3zO43jx1np+Im10cf/1gjhXr066UAYvISyGgcCnRiU24mcegzEqWiKEut+tmN8pvMEDjKU6CIjAL97iVeXv+QFkQUbpFoo8PxS92YGEHLEdkjRMySb4cMGaRZ1rHYFYlic4pH9hnvvqpf1203wu2Zhqj8ZMXlpfV62KjZZ7iTF9pOVP8JqfONgfgCgTPS5UIVgltGJZgm1nJ04jkTOePHdRoLvPWgNiDAK9s3apvj7vh2vGUZt3P+yr99Mhtvu4qqpuzZjhXTyOM+577gkGrTR4HGl3rcozvxH7Zd/vX0Smg54kVRXikI6sp0Ikjuf3EVHrwTB3qUSnv0WB3sc3TnOGRG2gNrc6OLwp7Z5gm0NF/+Iv9DRSEprNITyjRYE= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8yAa4Z1XUfy8pE0OTuLjoFMPIIKOZ59e/L3vNvgE1ag+LqHUbl1RCjMUYQkDopUsZJxrYhUTRGCNicbEaDuzLJ7rg50Yd+RTqkBtsnYKioXw1M4DhYCW/Ge4GNn6gG0YV3nmlcRVOtmTcbhwr/374/La9xF15NU6Mjo+xz3oZW4wFjhnw/Ob2aAgj8FOyN5jRpxLM+I7eL+Qhaw9gOsBC6EbbZipOH7Hwvk/1bouLh7WntNYxll/4txPg/g5oc6TclSZiCYq8Fc5E2rUDnZEflx2ODlpoAmtyJumMG66fT0MJ5+EVI1QLbWffgsF0uu3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cCP6lLFrkIwyqCeWj3EmTmxYRv/W5bOlMjAh5imTMw75NAAjYMUt4llJ0Bjt4c/R4RswtLHctdlPjm4+B4JEloTLhOh/4ADePiqDfeVtvk8tiUJSNEJdMUXmYEbsbi4qHYI5JR64zXMVXvaa3mf/6w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54bdf51f-a94b-4abb-3ef1-08d965068612 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:14.5388 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 14/25] avfilter/f_select: Free outpads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: c8gri7h+6fAc Content-Length: 1404 Signed-off-by: Andreas Rheinhardt --- libavfilter/f_select.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c index fad54ab16a..187e98a1a7 100644 --- a/libavfilter/f_select.c +++ b/libavfilter/f_select.c @@ -192,10 +192,8 @@ static av_cold int init(AVFilterContext *ctx) return AVERROR(ENOMEM); pad.type = ctx->filter->inputs[0].type; pad.request_frame = request_frame; - if ((ret = ff_append_outpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_outpad_free_name(ctx, &pad)) < 0) return ret; - } } return 0; @@ -432,14 +430,10 @@ static int request_frame(AVFilterLink *outlink) static av_cold void uninit(AVFilterContext *ctx) { SelectContext *select = ctx->priv; - int i; av_expr_free(select->expr); select->expr = NULL; - for (i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); - if (select->do_scene_detect) { av_frame_free(&select->prev_picref); } From patchwork Sun Aug 22 00:47:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29697 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp653541ybj; Sat, 21 Aug 2021 17:50:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSCtpOOCRvcbOTxksLbVoT4fbD9LVdsHfx3Q4FPIh7flA93sZEdZOVS2ysBiR7MkplgMdd X-Received: by 2002:a05:6402:d73:: with SMTP id ec51mr29487835edb.286.1629593411274; Sat, 21 Aug 2021 17:50:11 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e8si1508206edz.139.2021.08.21.17.50.11; Sat, 21 Aug 2021 17:50:11 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=CEh4CaW0; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F54868A54D; Sun, 22 Aug 2021 03:48:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68D2B68A369 for ; Sun, 22 Aug 2021 03:48:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JNRmyafcffpwx5ZyG5+7vYQlDQluq6WFuEBH/xORg37yz/DSfbfLvqwEc62qFUl4mpCHi0nNwwGwNya4nrfkDTcnwtRasuSoWAfxsbi8PBegbdlwL7pqVEJyAcZp802iRF8SA8HIWOVbVl89nopR/m3IVup8A2QitQfeKhG62q4HCRR+08tvEiLhiy5r2nTG4KyDwqWsM/l3LV7rSpteKtNrkpgtGJMscUtPH1/+9amsfd5WR3SQUr+EQFjj0Ak73qCVEvbMm94ovGPvOzIIYp0aG1Lwea/0UA3zuohBysVvA1bPP13cCCaevIQx9LQP+zdvU5VgU6SsJcnMMU7Pvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=N+fHUCSkUkuNntP9I8fXzTtZAAMXx9vmTw85rg6Bn1Q=; b=DAhohFHYpTnAn90MGopc6vk07m4LvfAJBee8KkRO90EWiKsy57Muz4w+rFobsUr8vOQj5KjXMad0cMRiRl2KGSyUmpZJ83zS3jZzWILRIneUIBZBGtc+kQnDmQm15QvNf01no07Z0jQ/ZBtspSzQM7iYaNiF5mqYVn3oM3wDHzLGbHg/boShOQNg2EP6ZfuKiJJTz/afqDh+O89u3xuf4hzKXrMUJg0y80JBjdgyqAMjLz/94WBWBxaiiS3/LdX3u78W8p0TDE7IPCf4eULpYryA2+aU19Ywnla76Mr/dyarMtSwEXptP3yziDudZzSfD1hQxF53lClfJMF4qG8r6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=N+fHUCSkUkuNntP9I8fXzTtZAAMXx9vmTw85rg6Bn1Q=; b=CEh4CaW0OMLepoQDGXAk7NlbAOyL3tZtJ4XY126/MVLkHAT+ls/LBd8tmLUDtd9oWid/7/p55VpPj6WQj9QxSgETC1KUgCrG+1yyHG7OXJIWfIWhxjnutg4n22lrdQy5OYTF8bbuKb88rX8wjeDGezA1qAw4g+oC3zRivGkP5Ydzrm6qUeL9fNMkGjMTZ0mq2W1qAEZcR3O4cvGd0CQlMYbVxSiUX3tPrD/XKomzf3l/NNpkxwW17cIDrNApWRdGJgm8A8ol7aJC9c93VsOBHccypWI9RpdmEjnWlJ5pfCikiVdv5I5T3l5XbJynuV+UziATdZSLJjZEJVvOV0S0yA== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:15 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:44 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [n0CfoxJga7PKOyghfL1HQQegd8XeT3EB] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 507d3138-04c0-4714-7e20-08d96506869c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjyEmRrECDLydhKoAsVaS4MoidSzkbYf43QnVM0TEFq4m2yUBNNPa/cqpwaAOIytiyKkFEj1evoRLkKII0i9snKC2onIplRHPeseYBTb4D+kVIa/30R3qJQrA42c7jdQjkVJey2RQI7jU4stX8TKamGbaJ6tK0ls32fRo2lL4Hk4YITEpW0ZHtjH+6tL9eqhphX8JMSXbBjyJHDMcqK7M7PxPa2koqhfvuZUqiY9sg4m7r2Xf2TVr18KmAy/ON6xN9o2MZI7Ku+5TE/apWFKkFsIOL46AnqiQ62r7R8lWjmxatmgDQnQSBz1TtdZ9hGdqQbsXNi6SmDcx5k6P5uqvhJqrdQKP5VJ74pxe9+PvWbIatNpunjWL7JkFPbRLvt9bTQHoaw4LTjraFw7KOKV4/Dku/lhNPc4RvUm2LVvTeDF4CmL/P9tkd6cbwfpJDnzc7skHEOXYT9ah5SO8841TSi5b/4tE6qSUdrlZkf1q+znYUsreTbb5o41LLy0nSG5QrH5+96fVv3KUti4vPUcP+TEOqYl7opYKsjfU7DtMH7/oDgqljSBoy6HdavEG36hhlCg3PawBZjAlDMFLCuK4n1IQRCyszqHpVnsyplMasEbYBknItAF4uBtOFSmrd9CwkaphZGD8l0QI39Rz8ULjBjQXAaAO3MY0uUDQ5tH/F+0Kl8y6FY3dx4l1rw9qiNUXgXNhqGxOp8mpr3Jo3k3A7zu4pJoWc3zdbZNGjwPkxBzIw= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e4haYBqUTqC1W7N5K3eVXwolUid9M4osOz/wymoVzWBc+takYw4IcyuIh4uTagQF5vbnwQJgSQkRrbCAshtvqLGPDzfZN/oXOOUeI0E7ZdR0Ve+h3lSImph5axf1MGGi7MJBWaMvdHfC/xOyWEzXHyUboOkyxqp0rh+bqpWFGWHJgQABcBfZlbqMtXgTI3l7LX4mgEddbn0pZsUvnFLQ/ei4BFxj0V13n+ez6e/HkS3/B97otTmWZRJhdNs90C78icC2FQ+e7LFVzJ8EgHRvKt/rct6LUQLiTMPT6162Wn12CNjk+R72GBjB4Gr87csSbg7XTctflzSVATK8rM9zFQyKk0MCgi8lUb7onXmmt3EzG+o6ShNuzTT4Tca0gEuZI0oG0szc8QWqLNqDIK4cH6hYRZoG+d36Qw6j6+U/8ZzrV6LmgCJzyzzmY5MHZCov X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: w2qBMR4OR2AHhNZQ0AnJycTzAB1ZxCqvmOFQDbFmEWkUEQ2PeQ3wReR7QXgumFY5ulylpSGKEoStBiuSmoE7YSRw4BmHpkhc+cEgm8Ry7FnibGmeTnyFcob6qoICHcsT8TuN83sN0iWj+jS1e851cg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 507d3138-04c0-4714-7e20-08d96506869c X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:15.4129 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 15/25] avfilter/f_streamselect: Free pads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 1k9jrsrDgexp Content-Length: 1644 Signed-off-by: Andreas Rheinhardt --- libavfilter/f_streamselect.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/libavfilter/f_streamselect.c b/libavfilter/f_streamselect.c index da2391898f..c5427672e2 100644 --- a/libavfilter/f_streamselect.c +++ b/libavfilter/f_streamselect.c @@ -167,16 +167,13 @@ static int parse_definition(AVFilterContext *ctx, int nb_pads, int is_input, int av_log(ctx, AV_LOG_DEBUG, "Add %s pad %s\n", padtype, pad.name); if (is_input) { - ret = ff_append_inpad(ctx, &pad); + ret = ff_append_inpad_free_name(ctx, &pad); } else { pad.config_props = config_output; - ret = ff_append_outpad(ctx, &pad); + ret = ff_append_outpad_free_name(ctx, &pad); } - - if (ret < 0) { - av_freep(&pad.name); + if (ret < 0) return ret; - } } return 0; @@ -295,12 +292,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->map); av_freep(&s->frames); ff_framesync_uninit(&s->fs); - - for (int i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); - - for (int i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); } static int query_formats(AVFilterContext *ctx) From patchwork Sun Aug 22 00:47:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29699 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp653644ybj; Sat, 21 Aug 2021 17:50:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0ShMn/uf6sbmo2yf6ntUc/uqQJgpHWNwh78Jg9MGsKxDJ1VEBgp0Yymdre5O2b/l6ApHg X-Received: by 2002:a05:6402:1d33:: with SMTP id dh19mr30125504edb.10.1629593423276; Sat, 21 Aug 2021 17:50:23 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w3si10402395ejv.301.2021.08.21.17.50.23; Sat, 21 Aug 2021 17:50:23 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=WJvXGauP; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AFA4968A5AE; Sun, 22 Aug 2021 03:48:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 765E668A2DE for ; Sun, 22 Aug 2021 03:48:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=keds2OAw99cvov80EPNKVPZihTNtG+A+F4cWTKmVEF7vphqu2RNlEizKkj2tfc5IuFaU+PhiZVzDARf0M8Z6advoU92suklwyPV+e2MoMFd/TCUGFKRkSibzpk0p6WtpXmwJ8x9nrzXTW8mxlngIHJ7i8TRUKRrtiF3iE2yKISG08O6213Bs18Lh2QiH2oh4Bih9o6pGlL5ksVJW+IwuJ8B1mFVcpsrFQmP1yhsJb124zSBfDhrk8h4od1dw9DxhUSmed/RECmIKddnGl4nIN61WEsNT3eFO9ZQtlp3dQCuXew0VLOK8IHDR64aGH4e/qhUCuxj9KA5QvK/+pUhdYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NsRMwhHol1k+tlDrOF/1SwFw+TXiznSvgJ9g7MNIZGs=; b=Xo5o8kQ9rEAm8jafLgiI4SSx2D1UQVaQrVcY6nBZIkpnwEULm4PtYGdAOTG4DCJsiSRxOocnV8Buzti2+Y4oc1u9mTQj8oqTjM4U9QvZToO63NXYioEeLDBAzq8ctYTYlc0wvX59X0RzNQc4zYMrE6F3FLtpXXMU/D6qhhs8RrxC5cLLhplEpxkAkzxpiZ8IFinBGk7QEodc+AWjS9ZEf+sdg1oDxoUEbx3/7/wxqF6Ksn7SIaUswkO782d1f30/D3Lh9JJOi/V8Pg0tGy+8l8qZo8Ob6ZWc+/kadq1Xqo0lUF7O3s36wiMNOe5KfmGkN+VS2iYfbB8Xxie5+CSzGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NsRMwhHol1k+tlDrOF/1SwFw+TXiznSvgJ9g7MNIZGs=; b=WJvXGauPkPjtAwAu00JzW+8N6/l6abMUf9f0oEsjYSwSG4HAZyh0L3GlhCXTiSc8t0LkyzUNymCmLouwdG+PuKyrFuCHYKKLT27wHM5LqNUAaXy4zbif4kCjX69GemPLRqfyLIkOKFd/kEHxRxmK94fXT5eEO4eG3Qwk93R5I3bGyTOLZktTyEhvDRXmANbYjyOiOURvNEogYI2E3VO8gnPrGiicEJiXSjXrCZC3/Z5v+xV+/U9LnZIyfP58IJ3W+KtgN2hjv+yarMFGJ8FHNmxhfa8AatdEW20296zqeYan5e8UVGR+Y6D8EB2W5KslitGrnGlQC10GT4NRe2CTzg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:16 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:45 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [yOukxxyqsI9/HBaLywz4GbQzI1b+QiVu] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d5e45352-8af5-4a55-afab-08d965068712 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjyUC3HGLrUc0AuOPyQyhvXJjqV5AgcUQlLQu7xVsJ6pSyxUyoRc1bKV1bjz83qVjrqPdxQPrT2JyHHujouMbkk6QUumz3+tISJn+AErbx+HTi1drTa59UUIpZPwxmLOooFRHk5nji/v9ElvBuBpk88785qcI4iC2sv7Hn4gmVMWkHv5I9uts4r8PmStPJ5KxtRpbv2kvGtb7RhMy/GFnHXPwUtqBNxZtwX3KK9kzNBVDmYDzNCzjTnletQGoFGaUDyHKf6+oPg/VWFgYTT7nplOEm0hifrosgXviTEtYux0oAyApmne0TOP36saHheCp7UyMXMWUFlfgdz2z8QgfFEKPzvl5L9z3AnSSztJqdn+OlagY5DaHdXg5n4dSWV4jhnPJlqQi94Ml1vbMSVZkhUmMg9IIRjGyBitLBR42M2Vddx52fiQKcW0JKvXriCSU5as9YnmK9LMvC6BH85oqvYdxo7WnMqoMvmxhxb49ubeBIR+K+GAOWC0j0b8evS3iLRTVGCnrjcCsAV1f5iOf3/rPtKPOwGHk1egUdkzraKhgIG5OtULsQ0FmzF6U0Ilgv1WuMF9rvWX2IgozLbjUZXp/ygOHFPhRqnIJ4XXDNu7QpJLjeL8zAIQydKUWm5mvomoYT1uITfVQThcpTQWy+Ek86Iz8olff7ZMj9oJVDtvpyvuZmyMrNjOl9ANotdGg/+Ay4kTTMLY22aWjvki8dD5gkbcXdt8iLSQ0OsCTjBlqc= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: V8d5w8vaQnGah2V4Ki+R00zWsqAmi9K+AE/8jlFynJ1BilDaJs3khj+8TLscUkedoFbNkyh/eyY4qF6wrhsmfE7ShMmN4A5hHoZeDo1zvTGSTkHbOYutZMeUhuRdI8XUXX8a0ZQrAUyzyk5zP34E+vbfIfclIKF2qlK1767dXUMNumk3Xqjrpoi3ggP4RKNof7hLZFuRChb5WMUTOjPbPFaZiAH0tejvAouRf0ZP3m3ExaI/OFrze4nRBU9X2WzKLe7OpAVHIShfIKg+XoV3Uj7ZhCGsNV8mbbuOGhr6RU324JgblfqesTtwHvTjOdHILjBNcK0WyRCmD/DyzKk4ow0AHvoaBNrhgO1dVNM0QPaDPA7M71/Fps+5hv24XVMgWN+l5Vr3doyXC1abo4k+WkTsKzO5XrF6cduPH/bzsdD5X4BLrEG6hAGH2ghaRLyb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hOXkquY3rZwqAqZ/2Ko7zsYson1WuTXQNQGGfSlNL9f1YYqcpioxE7/eXlRSzKrRqyV/ML0FgPeX39WEiDMlFMuFLrOrnlQsz/ZqZpCSfW8NLj+Cq1bt53w/LtKvkXa9wHWhxJb5W0j17eZsmHMMOQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d5e45352-8af5-4a55-afab-08d965068712 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:16.2184 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 16/25] avfilter/split: Free outpads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: JoJuTP3gY2rC Content-Length: 1831 Signed-off-by: Andreas Rheinhardt --- libavfilter/split.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/libavfilter/split.c b/libavfilter/split.c index a77ce6f6f1..b02584d0ab 100644 --- a/libavfilter/split.c +++ b/libavfilter/split.c @@ -56,23 +56,13 @@ static av_cold int split_init(AVFilterContext *ctx) if (!pad.name) return AVERROR(ENOMEM); - if ((ret = ff_append_outpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_outpad_free_name(ctx, &pad)) < 0) return ret; - } } return 0; } -static av_cold void split_uninit(AVFilterContext *ctx) -{ - int i; - - for (i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); -} - static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; @@ -124,7 +114,6 @@ const AVFilter ff_vf_split = { .priv_size = sizeof(SplitContext), .priv_class = &split_class, .init = split_init, - .uninit = split_uninit, FILTER_INPUTS(avfilter_vf_split_inputs), .outputs = NULL, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, @@ -144,7 +133,6 @@ const AVFilter ff_af_asplit = { .priv_size = sizeof(SplitContext), .priv_class = &asplit_class, .init = split_init, - .uninit = split_uninit, FILTER_INPUTS(avfilter_af_asplit_inputs), .outputs = NULL, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, From patchwork Sun Aug 22 00:47:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29717 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp653731ybj; Sat, 21 Aug 2021 17:50:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+xb0EU9JRDpMmUhJdncekvs0fEcPhmKNaIJSHDRuqhHw5Rw0s9AZmL5bmUpbFjWu9NqdH X-Received: by 2002:a17:906:2acc:: with SMTP id m12mr29470076eje.231.1629593429675; Sat, 21 Aug 2021 17:50:29 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id aq7si11227016ejc.175.2021.08.21.17.50.29; Sat, 21 Aug 2021 17:50:29 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=fLB1ry4u; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD45868A40E; Sun, 22 Aug 2021 03:48:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7DBD768A2FE for ; Sun, 22 Aug 2021 03:48:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HTamI+dFY0tGT/bZSdxL1LiAqi3hqlsGJDhpq60zUoBVgi7b4wSDpMXhpmscIHcMC9tmhc4DEvqguyjD0AN6BydfW5IkGNvbTeYiiWmiErbrvwblFxhgncY5seCB6oJj9h5siapNntwV7FABuq43l+Jxvp6Ewi8GUItK3U0RaVq0/EhQ9vnwB9lOxqu9FnpIh/EX6TnQShUvdGnDBvDfHQxXiiBDuT/FIbJvE3xmQICuFnlNVl3GnBzvvyOu8d06cBRw7E7cJZ+/DErEl/Rr7rLkQ+K6Bfc09IgWTKc+DhJDEv7th74JUCIVQCKDASSc1pMWQW8pdTpxmAQ4oYi2nA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SksZL1K+sIn+GrPPm/3AQ0g8/qmPbTFyU2gIaYbLT4M=; b=eOTzXW4pOV+MKlacqkw6xHiAB4ETGvxY/kH/Qkz0DP8izjJnB2coPathB1PSRi8j/Tp/9NTH9VmlUN1DpMJgmeXTyVlZptOF0wRlYWPNGF4j5EyhfrPze0onegUV8gGPoU7cNaZERN8CPyvk7lvxIvY/y4dbCGl/zvN/jAc7OS9KMvl2UPvCjLxf9Yj98Sct6R5yVIBPVjHSp2cfcrwBwI2I9uzHP+U0yQGtm8tXe24Kpd5MXApmupzF/YmwmoI56RTrozZv3jyfX3gXheFhYNdIMRO9Z3YiKYLJ+/7jchPptESOiYk0KiazedN0wb07SC/AM2wodBH+zf4bPoYWaw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SksZL1K+sIn+GrPPm/3AQ0g8/qmPbTFyU2gIaYbLT4M=; b=fLB1ry4ujXWgsgpZ3l5Povycwj5oOCwk+g8WNF0SulJ2JWF/CWvpyO5pwzOf/Jw2d+5Qs64rAJtacfKewRGRb1nP1Sl5q7X/w8TiqHLAGHgbWtEEOlQ677rwxAWIhiTtezy7xLHsM8fh25D2U4l9N6BGek1gjajB8+i1P/1ExwhMIesG+fllHDGBTWQxah5kXN9kjBmCIX8ZFU79wibwnUkqcb00cavKzx16cV2L4MP3rpyXRc6O5YEpg9dz0MtRHg9vWRbR/PX+F+7LGe3FwG2NgcYetiCv8pUptAVNv7aCq4/V6Mwnw4IqIwJRUNScFOGJ8WOU7hxnzCzdRZh3Fg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:17 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:46 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [oI0verf75v8AjywssHuaW6rGTMpFlMW6] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 341f51bf-4740-4634-11f8-08d96506878c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjyEmRrECDLydhKoAsVaS4MoucKMWzQLL+2Ls6tC3B7+ShFAwz1xgMuXRC6+HV0v8vFdFB26VqC9SSwJoKG3yOGw3hh5aYQ+XbVIVEFffGuzzlLOevvyo7P43xhUm564qw9JunzjSeJdRZhRbZmrY9ll39aDvQ2VIlvY/aTQ3DfbFpWCHA0oifTXMYr0iXG9NmSPYMIDbuxB53Drtz9CujQAsbfHvWSa9cdUpbUg4hgEVXlAQiTZs9X3+sjfw5KgFmhJSFFUFCRDvoizgGuzMmjm325urkH/G/GP2+TZi0vnXZuCNS3E9a675GSVNk1CzvOR3+BWy1pgZpJo+bJXL0vTbP0V1ZJT8ZkxTAsmI+tDuqT4h4fVW8Rw1R1qUHTZvVFyW894GbQNVpQxbPH+fROdmilp6sG9o8ImGv1wK4KtNU1slliURLc9rzKE68D2dNMnaVWkzcq6scZwmwPx1z21c/j+cYYu71HKs4Md4ReRNPK/nZmkEUrRpBKNmjW0GKm9grySMwnrx305qAmfmnUfVrrUZ27ubg5IzJ+zOnkbth4rLnAhqTh7fSDI3uW7a63giSnPZw0jga8UG9Irz5193m5Wgfu48DHE98CYnJZpq1exBCxpneRcBuZ6lByiUFwVMTIF4kxrUWohIgDsiAhcYxP8yGO2bOoJyzLvR0AzWOcA1rvzSd06Q1ZfOSnecmU9NjhswvRhZZXHMelFGrO1g2NLzVL7bN2W2jYmDx9flM= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6qx9GR+z1W5KjJHx4xOchT+5PKyB9xO47GnvPdSkldYqY6N74uWiAGtfqL+/bdiAXRDqeuSHBne9Aaal2iUOGvCduIpyh98e8r92GpygDPwvRmn3nidGOtqfuCSCFvkRHM4UJTGl80bSzJZ0jzutJMGeg6zRGICpPTsJSsic2W3l6keB678Kahw7xcEupKLwphtGrwbk/5Vb+MORfYrRkED+/w5MYggcRctEFyNpJx2zDFOtFODrXufnja1rvqdJ5CV5sLOGzKSOBYRbAWDNsXyjroqWZPUugQaFGon7cpgx2nSoUGmnptc/WvLFHjL4GxqxvqksmQ/tI1keKyMlIPdh6XD8ypt5X8tUQd8fV/C0Jz/e/cAoQbUGK7jJnqo+jdJ04o5yrPUsaeQZ3+vtNisUwMI4d8nGUPMWeB148cf6S+koGdq3x5IU9E1aMwoo X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: orwpvYqhUfQaycnl77ZHvDziFX9PKKIG3xZqQnhUwe3+4rugeYbYaqxsmOiTqGvxirhJ6aVy0HA7zdmxSosL9iyou8YrrK7K3vIy1A9ntN6aA7qB66ec3LYEba4gWdogWFEn4fmC3AQWb97iopUOxw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 341f51bf-4740-4634-11f8-08d96506878c X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:17.0278 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 17/25] avfilter/src_movie: Free outpads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: GIbQ9lXLrQn4 Content-Length: 1467 Signed-off-by: Andreas Rheinhardt --- libavfilter/src_movie.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index ea5bb90255..0d63c1e4bc 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -306,10 +306,8 @@ static av_cold int movie_common_init(AVFilterContext *ctx) return AVERROR(ENOMEM); pad.config_props = movie_config_output_props; pad.request_frame = movie_request_frame; - if ((ret = ff_append_outpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_outpad_free_name(ctx, &pad)) < 0) return ret; - } if ( movie->st[i].st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && !movie->st[i].st->codecpar->channel_layout) { ret = guess_channel_layout(&movie->st[i], i, ctx); @@ -334,7 +332,6 @@ static av_cold void movie_uninit(AVFilterContext *ctx) int i; for (i = 0; i < ctx->nb_outputs; i++) { - av_freep(&ctx->output_pads[i].name); if (movie->st[i].st) avcodec_free_context(&movie->st[i].codec_ctx); } From patchwork Sun Aug 22 00:47:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29702 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp653854ybj; Sat, 21 Aug 2021 17:50:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxn0wwSZGlFIfMp5DjZK+lMy+s2G604FYbNxEW9AVhWz30phlBGbsCkyqv/6qKeqLlt5VsT X-Received: by 2002:a50:cac7:: with SMTP id f7mr29868045edi.302.1629593440979; Sat, 21 Aug 2021 17:50:40 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r23si10891423edq.379.2021.08.21.17.50.40; Sat, 21 Aug 2021 17:50:40 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=l4RQw5Pn; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9D35C68A5C0; Sun, 22 Aug 2021 03:48:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B71568A33F for ; Sun, 22 Aug 2021 03:48:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D2R2JSJRZkqPHNFl+A4Ktjv7Xn60XREhlPGqvirGBIK6lJo1ZcKkdszM6STG2o30BPQEyMp7LQ08r1JtOXWNxN9G5ijDyUd3kS/k6Z9ww9+5nI3KPPX3qlbRRX3cVXmMJ6AwJkUiJrDqMgT2HuFx+mqhleTkXuiVMRC2rvrcyWaqc9sJYa3il7+qezoPu9V7Lvl7nnj7Dn1KXfDZv/uxto0YAtt2GyHGYj3B0NQHo99y3nKG4/x99vPJ9BK60J/oES2Iaqbkk0Gq0Ve/4qwnrGSuBVQ+w9TvZ5AnoPfHBXItfnHLxtUXs1I2/wedRQwlTwnKCKJ5+ZlyJIxZdA8rLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5z+8MmlnaSSQJj3CE7xKd98nZEHpx5NYt+j5A2cLY0Q=; b=Q8XU3x/y0F8OGdbpxE64dzg2umA7v57sHQR1X4sCjadU9cJkdOxzf2mHZ/imVVXg+brmfp8BUyFIW/U6etm6js6CqGM76sa41F/eqeuF1rd01i/iGRIiBt+AkzGr+SFnUiNrbVE2iLev2lJnp48WyME1YkCMZ4fCwrYCDEDHniFfb0IriHB4uUPnT2fB+xi0NoNF0PB1lEfLbGhR/J1peMJwZsu6dydgCFq66bX8QjHw+qWXQi8xj9HdorpBW9d6dmf47Py9o2UxOInAfR46ecRsZ+OumvJt4tPG4DLWCmjDU2kv/ZeBCA0m5QiM5Ir1QsrccjpOUN6Nga1zqvXPuQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5z+8MmlnaSSQJj3CE7xKd98nZEHpx5NYt+j5A2cLY0Q=; b=l4RQw5PntNj+TVNHI2NY+OdgXDMBceIZ0ub3/teRF6hm9HzTd5xJu32ybFojdrhHk2keSLiBIJgVAPLbsRrpFOB19cz8oEa6ntFaEqBeyh+aDyExzqLNJcgQsl1TCbe9xf5ivM+x/7UY1MUiRf6XDCyUYRYqHl6r4fW4nXiuLeY3Dk6lmLnKfTvrvGKsKBqsOUypPFWCuZ0K5+D9uFMLEUSvV6SatcYzcgmkHPjJR6uOaBGoeG031+Jhl98PxrvZK4IczEBb6akLTn0wX80v5gF01bMm5OrsAVnBl3IHeMwOq+4GvMnvu14qF95yXEE+TbN43q7Ka2yF0njMsDcjkQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:17 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:47 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [HBR54gonbbYiBbrFmFBcbo6zUisxLX80] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-17-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9a4793da-74b0-4b52-e286-08d965068807 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjyuigJTgAtPIZBRvSERZGlPXXIoXHDWiUymwxekt9ET9gR/SdKrD0rI3bL94BCwyF4ucsnhMtesm6HaCpVJlrkHgNsVIqLPlR18Ti52o+nnp2tN1Ox9v0kcJBhxAVHPBYfuOrUU58vMg8D6K6eD24oP32kdSMS1N9Iau/PzqfAAw+KXE/LIU/r9Gt7vCzrD31O/rbqoz1axW41imyLCA9JVVt0u9+LwM/GJMcmuIo8jHYr3SBdrHCkNGRT4ijb059siiAPh9grshEpE9nBhgaTntTgEmA0irEpqEBOMIGrUYslM+xck54c8geIapT9XzjabSAb+n2plDt9swGDgWm8p2thBnquW8biMr0J8kZmjA3vtNaiH/NSn2DVzPqKogyzQZ3PvLAmazvCjYVPC2vwzjENS0s3K31Ma4aASEQyc6maex2Jk8qlz6oR+FsiZWlY2Ovb1sYLMuJZxwufBGakIKQUVbnr4sNUyJMl7+OW4I8TsEpTSmFlD0Mh7XkvVuYrtv7NPixYqubJ9CryeMgxOCmXvmsYnY9RQE0J2LxhuS4tKf88q+F6Gu3c8NjV31A+gsF2Ayze7O0eLxgJXNlhui948WdWsuEGfq56dpWNDkxeNQ8Tt8Krh5T5NvuGnTOUrpcl3aytN48PE+YKa1OU+SRbFMYHJ45ZcBTSITQcGlRGbLuTE15rP+FejMQLywN7PbBn3IrOb+UVljF7gZkK4iednoLbXs7sPknSfwxtoN0= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 01ZusaHDO8jJ/WTkLxMCoQlZV8OMdAj7T6swd9x8662QdAPVNaRziwlL3zyZi5A4D49kp5l5kES4Edw9vv2lExXiRdKvaTAFfkOVHrgtMm0zx4YzBfz10+ZQINpgXiclP75AaoFRHD5ALkIYgMdSIjYAkvlghjmQ1ZxW2t0PXelcvgT27u6LomEkoGxWYwYfM0Tqntps/avDlQ+oaT4gHLufNWGGfhgiUNeMNXAK+ICJmLKbakmu0UIXAbTllIkMR5RShuuKQ68acBbH96zereq3KDjqluwiar9dZUmlhSMTERwFvLqtZVnPOa8mSZYXPz+8FIK2fN9cFwCauhvRL9F3kxPKsokcSIugpDHwAp87ZgmsM8aX+92WWx/nAHAd0UKQ6KqboxvGGv6DMpkTv6/BmhsN0noKvMfz/obhn3wSRgaMa/2MqiMekOy0lupl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +33PFLCamh59x7oi90LgC2yfDYnW3BoNxOWm6EKvaKjN0bak8iFBbs3yxPK5GgWCn1NH1XWOlDfcAw2g2/9NC4rQFe72RbNOj/FlUKxLHyPcNFcyZoyidEqBpbAEJLHfEPpDCsQkdE012BLSC77K0g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a4793da-74b0-4b52-e286-08d965068807 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:17.7885 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 18/25] avfilter/vf_extractplanes: Free outpads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: /ShXCsjjIcQN Content-Length: 1919 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_extractplanes.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/libavfilter/vf_extractplanes.c b/libavfilter/vf_extractplanes.c index 54bfaeae5e..972cc17329 100644 --- a/libavfilter/vf_extractplanes.c +++ b/libavfilter/vf_extractplanes.c @@ -352,23 +352,13 @@ static av_cold int init(AVFilterContext *ctx) pad.type = AVMEDIA_TYPE_VIDEO; pad.config_props = config_output; - if ((ret = ff_append_outpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_outpad_free_name(ctx, &pad)) < 0) return ret; - } } return 0; } -static av_cold void uninit(AVFilterContext *ctx) -{ - int i; - - for (i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); -} - static const AVFilterPad extractplanes_inputs[] = { { .name = "default", @@ -384,7 +374,6 @@ const AVFilter ff_vf_extractplanes = { .priv_size = sizeof(ExtractPlanesContext), .priv_class = &extractplanes_class, .init = init, - .uninit = uninit, .query_formats = query_formats, FILTER_INPUTS(extractplanes_inputs), .outputs = NULL, @@ -408,7 +397,6 @@ const AVFilter ff_vf_alphaextract = { "grayscale image component."), .priv_size = sizeof(ExtractPlanesContext), .init = init_alphaextract, - .uninit = uninit, .query_formats = query_formats, FILTER_INPUTS(extractplanes_inputs), .outputs = NULL, From patchwork Sun Aug 22 00:47:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29715 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp654002ybj; Sat, 21 Aug 2021 17:50:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3D747ObrSm7vaIOu0R/TWSZxz8iJs0GhetbTgEzsviL4EE2dpT44kD4VK2FpSxV2p1Sjl X-Received: by 2002:a05:6402:781:: with SMTP id d1mr30536612edy.32.1629593455436; Sat, 21 Aug 2021 17:50:55 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ee21si3391963edb.541.2021.08.21.17.50.55; Sat, 21 Aug 2021 17:50:55 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=GEvM5hHx; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C5AD168A4FE; Sun, 22 Aug 2021 03:48:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9521668A307 for ; Sun, 22 Aug 2021 03:48:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OuJPpFA2fX0cX03IZk/TAOJd73EdIzgRLLxiJWVll7f7akIMp4vYzzfftqKU2HYGVdaBxV1Ix9q63DISr4Biu7QfMmfHwaOSHOijHnDb7f12EykzlX1RtE0DGzw6FnFCT1OCYYMH1IPSEw8k/xvvx9efBwxzwtz9UW8p+Ez8yWEBCzGrYI9sKIu1MO6qtiHulagrk5q6xQFRvMzlXnsErow9/HO+9xUS0mcMhcY+bAK3hJWHXq5fHs4zftStoS8TKQw7j3CMtmf4lNTqlk7B9uh+I51cgWYAoDwYk9uhmxWEBFGwuAcWbNVp0olUArS8O3zDQoAlMNBkjgI8UBkg3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ciVz+X5IBJN9GQOOe0JTNi3+m8lUVED1j0QGSQFZRzk=; b=FpuNsFVaa5/RIEM8bGi8JStEIX/B/KFXV/oGeEer9TWgB7rm6OrniT0Snr7jfSMIAQfz1twSDuKXyCy+atfjt2KqHdEXRM2X7m/eSqoz3lEjCYCIMrq0AcfqUQxotm82IEuWZXSVp8lL9cEPsqpQKCGxHPZOXnc6Ael85h/XNyUVjqGuJE705nMwV++NSdl6gX50dwwE0rkQDtTvgc4Eu6kuLgXyRCZw/LHSzDXjBToay4W8bO9bJ/sYVxSE9GVpslS5CC7B5bGBuRryYSdAP/MjUX0NfZrWlIbBDt3UTH+JHi1Sl/UuVSHNG0n8LN7e1i4YrjLbP4qtSnz0sFtOGw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ciVz+X5IBJN9GQOOe0JTNi3+m8lUVED1j0QGSQFZRzk=; b=GEvM5hHxhAuzu6wvvVkJy1q0yjluL1dfuV1RWul2IirlAf7nlKYqKMvLh60d5ef3LHAIy/CUWLcXai8cpQMsjJ9CBPp++1aAX35tp9ik6ZK6P+F742j1dry9oxoE+HNoVApgMtP8k50cUowJsWqfytD1RYWa/ZGlb36GnDiWFUXRbf1HPtJ5YzFNr3lHeHTlkt7AUAdFeOloZvTldffCTZ//th2u9yw0wSR0e48G12a/ks/nLDT6fGSaIu2d/3f9DWzvNutV6Rui6YWBcjiJARVVSTm319RW78T7tpieJ60MD4dczTz7Cw63ddDQf5TUuA/EMqPyj6UBWRyz3HNNqw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:18 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:48 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [SD8+36ZqJaqhpCxwy3rFyQrcUMDh7nhk] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-18-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 43cd74c9-d11b-44c3-5209-08d965068889 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUPHJiP61NwviEKWmldPD2h2+BRc+el+pRNZQ69S1YnduEEOuc3HZwP7PRmhQe99B5MrTgHbfcxe4ivycL6paNEVj1lo7pFfacm9a42OpIa0uFqvsBKqZ//oj45M4NtR2nBdMIE0R7ZhVJt7lPZALv6plyyi7usuKkw9kXVOD72/ml7mWmPKp3FW1ReATBFKZrb/T/wS/KevOAfRkUNDZMd/N+/cL95XSodV9xoDNoedDZ71FKv4ayWGFMqKPPpb3Nvyxy2NHyniX2HevivvBZfbVC2yi/+0Hk6Pslz86LwdFhfrGr5Mz7A2eUqi+/73S5Rn0wSc9qqANTmuC62Vyh6pW1+xjGdIuNQ7yxQZjnsAlm7GrDgdKOYF8Arg+isPPX94aba0ZQLxVZS0YO4Pxbq4M0JytaSjpAg+kNP7EjpHKDLpjr60nxi2h5Qhn1XCZUTt03r1ZQKaPd9b5GuD4pBKDlXMOTN8+W+GrktLuP3kPhvxzxNg1uWwWiMMzFSVdQdxJTf4zoqmphdkWLoaIBbBCZVhC9qfYgq5BPNJ8r9zVYl9o9y1UdoIsN5fY0nXAN/tKVL6vO3ga9vHtvqVKKI0F2Aep8sEa2xoLjxta7Oo6O9fsaarEfYpUgxOAAqy2bUXTgTlQUV2r3yb+zbXG4ESaVvSMzdkt1evjdhDvC8pK+ZygDvUn2NDfD4T70TsVwAVLQuRjwBRvvy45CrXi0qg5UyNSL57yI= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hFXjZW7fnd9MaYV9rtImVq1QVawQ/euOswexzxQM+C9NZ3veVq9rcUud5K0KCc1GymvO+5jlbOpfwu3iKqCbJxIpyG96DFCPWFXdFaemlbGBiB4/QZQUa/0JdNRWh8XDD57MOO/7V+q32O2nzH0FYoQbqm50rnzRyzenMAcHei7d8lH04INXI/NI4BZQKWnkIY0dR0D4RGubVX8pwXegrc0SVTt73FgXTA6kZ+YjmL6c1f06dOWBxVkr3SgYy2U6ycParynldJWuaJm67kTZnREsauLbe0EyAIHZAfZj2o9FsMGQAzV/TzW4kcgeyUl1kXiIkNhYgvEifWi6fh7EqyVbUqCwA2x93U+/kJS4rJYjq2x+K1CTSs0qFnICTzLL1ui+WAjF7CMrYEo0AwMuLkvzei9pjEzePnMn94b2bozrd/IDoYhCe5caMe+yroH4 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZEXJ8ydggp/VYMNVcF9nygedoaUce0OOOKPsyCMgS+7M71Scc+bU+JFBZA87ErsjEJJyRxQRP9Ggvz6uxX9+KIe8x9EF8FqhOeT3IsXAwg39AkW3H9dT4eJymJtlqLPh5ticPRhtHJjrpztPFvsCzw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 43cd74c9-d11b-44c3-5209-08d965068889 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:18.6975 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 19/25] avfilter/vf_mergeplanes: Free inpads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: ufydyuEfutQN Content-Length: 1294 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_mergeplanes.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavfilter/vf_mergeplanes.c b/libavfilter/vf_mergeplanes.c index fe68c5c7e7..638a7065f2 100644 --- a/libavfilter/vf_mergeplanes.c +++ b/libavfilter/vf_mergeplanes.c @@ -96,10 +96,8 @@ static av_cold int init(AVFilterContext *ctx) if (!pad.name) return AVERROR(ENOMEM); - if ((ret = ff_append_inpad(ctx, &pad)) < 0){ - av_freep(&pad.name); + if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0) return ret; - } } return 0; @@ -279,12 +277,8 @@ static int activate(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx) { MergePlanesContext *s = ctx->priv; - int i; ff_framesync_uninit(&s->fs); - - for (i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); } static const AVFilterPad mergeplanes_outputs[] = { From patchwork Sun Aug 22 00:47:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29694 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp654166ybj; Sat, 21 Aug 2021 17:51:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKaw7F4tv8i4+R/qpJBeggF1Pz1aSFUFn7SRp0qMBH5yF450B6RuaEabtiOQypuH7ET69G X-Received: by 2002:a17:906:a108:: with SMTP id t8mr28576382ejy.407.1629593472190; Sat, 21 Aug 2021 17:51:12 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l15si10467646eje.462.2021.08.21.17.51.11; Sat, 21 Aug 2021 17:51:12 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=ZC8tLEQc; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8C4AE68A5F7; Sun, 22 Aug 2021 03:48:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDD2D68A506 for ; Sun, 22 Aug 2021 03:48:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MvHAVg/imtVINy5WPPBGSjYG7WYjhWTvvR3rNE0cD1pciFcGdYqnTf70guUEL/GcypUktB28ReCAUDAL4rKFtfRYQKUhKgIXL5Sjm5az2o3q8ZOC+NsNUdRfSFBaY11HbaOis7josWGioqmdUDZqhP05RWJRB7sQnyDXCjaKNEvVrfoBTMLU5lLDSVwKxDC+WahOftGLAXEiPixKxiGk28uYl+9upjg0E/HdHRIC+MbMEYJgDlCldnLfbHzpHrQONlKrE6J4C+DGg7+y5rLkGEXQkn35JaJjcfe9jNN8lD3D9v3oVI8Eu5gGktGid3nJZOfzjIeGwsFJ5+VIDUktKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CsEvT0Vmz+79YxS///4fbjoYlCJQ6sN41X4xOmekYzQ=; b=f8YK/eYt30GMsjcPCbbtqgQd/8NYIis/N694zNnB7EKMZctVSpWDK3icGYJ23ySbTEDL2OJ5rmNwn+TThLTCOIV/nGT+K/nY7ypYD32nLN26iGdHBIsuw7wYzXhI9aJ45EWAqQH1/FQIvzS+Ro7YDvk/XcYbv3/LxWv1IVrFj9A6GsAVcfe6ZX2GTVfAUDXOxYTvifytyPpYcmdv1TGsmqAaWuZwRr1Rlfc+c7whwXcKI1/MIU4DpCW6DKt3wHjmDZlAKJ7CPOrHCL3XfUmQwRWhOIVGW2Ie1IeKZ8jM6eH/HpuK5lkUbtM4XXjOxgRX/IknPmZRliC0FZSJ49TpQg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CsEvT0Vmz+79YxS///4fbjoYlCJQ6sN41X4xOmekYzQ=; b=ZC8tLEQcf2+T2qRJnqclgjRdFSZsT6YDH5p27qCIhd1tAdSvhsLW6ZbmIqh1O/1btf4y3iwMLM4Q7sTNk2v3q33TPSNR/Q/1sjIfGgZ/VGa7CnaNn3X+W4yfnbGdSQHdWzKhxppRCgGrRY3DP4AUhCkVlI3h5LlhEx0QN4yTnKD0NAhwuoasain4n3tww/WrKEhCQoIznEe2PmeW6Vg5VDUU14oA9JV1+sOz/5vS7prnwmLCpKUlromyJY4mh8afKHhBYompAjEKmoOmBPxHFkbXWXEkffBByxfblwdHKA0GmxpzvB5fWyvgY37oGwnufMhBCIRo7HUQgKRHq8xt9A== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:26 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:49 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ApcB/WQ/wP0xsr11UGyxWntvyHiyEtQM] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-19-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:23 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d7367fac-b0c7-4572-3374-08d965068d62 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjy4FHQLxWW6+szUAlxfAgec/pkpB0jZ/MJ+Azrc+xNEQQRnJfY77Nc1NmKvNw0X8nYRovQFgffXLD9UGrwXXmGBLmn6PSm0MJ/k/eGUVfPGLu+ug9vE2WB0o5UNj5Sm/uNJQX+XU10a6hbsSixNhXzGgPseGRtgtMMyelIvza7mhru2bhJjQwiTjLbd8zQs1jR8YUMM3TLDC5I9SXr7YB1UziwPAfEjm5YA4LzvCRU+Io3OhfHsO3QW3hgdZxoAi9fMXMFY7Fpdo4KI+bLtMbZVtSX5/EQqrGMAPpqmT54lPn2TRfOiCuWG7y+6KDrNuF1lzJscqRiGZsXPMjbOamI/Oh2pxH/roejHIKjmTwa6NzhVG/++rcsrUDJ3gX5i+4GGtPkJCBZIX43Sorup0xxurHV/rpnk4U8Rothjmd7RVPTlke+H5yecLtXmd6YTo09JfmeDQ7PIsVJ0KqjpFpVYMW+2GKIa15PCwgvBQjDCl8jgagj0VqraFDNTttgGVNa3NfQEwv4+1GxMK0HY1YaKeoeErvDdFiQTM11/PCobxkTCDsZDCzSGUKn/9WEvAs02v8HeqfQKBOpQB3JBMjtVECuPV5KXr8gVdMhBpon6HOCd5EOryNxbSlSEs4nsnSMOnpEYTP+SvJJ9iaUvNogjOl+Z/Cndy+rpfOcfKdx9TOzbpRBjhjZa1I9M8uSpqPmWf4iJt5kUFCGdg22JNrxVoQ89/9Fc6FGq1UoznB6Vqg= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gV5LlnBkyI/UWhmCu59T3X203V545yGhtI2bTqq8gFt4a8aHyzHfxhM7o1bu/v945hIuJCy6TPwmV0npHDNpgkT0ajZqrdKqNh9KAZWMmB+m3fO/bjDL8YZ00V+LupVWCsJiqUGuUPkmDF99fNj4pBtR6QTyf36KLiZs5iIlWUzN3/2Xi23THtYcF9sBejR0Bpdw8G1sZ26S2TS6uPqCiLYb/2WpMh/RvCwHz9eHr5jkQEsJm17NM8JnQpAbYiI1BG/Grw6oulgLLSXb7ruqgnZubL2lZHDPOiPQvcYOCEOOB1tzfhOnZEDo3AiuCoT/8/8g+zNIRUU8cjCCymJel6le80G8YeQZHbI1rhr+nQNxZa2eDlwYVJWjpicNmapFw+jqzjp0u26Kstijnwr6eMvCCt6OMkk4+4XMDuzS4fITGTdd1p06uEQVQyOLEaWi X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Y9864D1M65jWWq9gKDdOwJTuOMmDh4ZpW3LQFmAuusD/eqRHtkb4FAKrO/7twTscplzbg627ePvYYOM+rLxbdZi2sR3zJBtRCfrsYT9mY42rqhYZz6wMj/VOlrc6Yhko2mUXPD/Ugvgj1JXy8FFa2g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7367fac-b0c7-4572-3374-08d965068d62 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:26.7909 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 20/25] avfilter/vf_mix: Free inpads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: v2sA8wCSfMz/ Content-Length: 1324 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_mix.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c index a581dfc8ef..ce66202557 100644 --- a/libavfilter/vf_mix.c +++ b/libavfilter/vf_mix.c @@ -125,10 +125,8 @@ static av_cold int init(AVFilterContext *ctx) if (!pad.name) return AVERROR(ENOMEM); - if ((ret = ff_append_inpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0) return ret; - } } } @@ -304,10 +302,7 @@ static av_cold void uninit(AVFilterContext *ctx) ff_framesync_uninit(&s->fs); av_freep(&s->weights); - if (!s->tmix) { - for (i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); - } else { + if (s->tmix) { for (i = 0; i < s->nb_frames && s->frames; i++) av_frame_free(&s->frames[i]); } From patchwork Sun Aug 22 00:47:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29708 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp654224ybj; Sat, 21 Aug 2021 17:51:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuQpvDDhka5/GCIgn3uO62FZMVhyeboqBwQvPS0XPXIwEtAUiEDRyT16qnbtu6n2BbUl8W X-Received: by 2002:a17:906:b48:: with SMTP id v8mr28533916ejg.258.1629593478173; Sat, 21 Aug 2021 17:51:18 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r6si3514815edd.12.2021.08.21.17.51.17; Sat, 21 Aug 2021 17:51:18 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=XeHYWgWn; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0935C68A605; Sun, 22 Aug 2021 03:48:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.109]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F2B0A68A2D2 for ; Sun, 22 Aug 2021 03:48:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NCgjnq/VGzxMh9LhpgObcwpZX9J2Oq9Zc92hK8JmFLNj/b63+OiFoUGglLAQOjqMjzH7Q3bbHfFsQSeCWnbScMzvxsBhfO/rM+nEYkDjHnFVm7cdUSagt6jEN1NdZs9cW9ZzCiaH7okMqYZS+BWnWwkJygbTWMLYdZi+gYPeVhZyfypxOXD7Qy7k8MTA53b8BM58kg/3N6eHE+o9vtsBaZ4E6LbFf25K4KgL4zHjQt4M0N1GXhru4CQESjYojm2xvR+mr1XzBDwn+cXkgri8NHcZSOLXUAU+LS01nsvoqmFGD7bIzG4G1kRE/NKX3ibsS4IBcAiX8GvqoHWjT/5+uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oJqfRWasrTSLzRprTkg47EXv0iZC1wEuvAP++OKeSyQ=; b=OTsQecT7lwkjqD3ers9QN9apBwHAZK8Z+4td1xbZi3aUPDh1FgxLOmTGfEjes7uiUgykJg7vKPiJuQHwIKjUmK3SNOTIQNkSmnPpoGCofmiOjohqBew8ks0f3JLRtq+7jNQDbdOAqR7KaD2sfEUusH1NQgkw7ClU3vWx8/NdLEos5huGK4gbucqyN6zfjPiLuoKHkT8kClZLa9lDsE8TS4s9ZvaJIHWr/M5UBNC/Z16Jcbp0qodg5nNvEqepgfeDv7pGdH91ZVt+N52pUbCVT1gjORti3p1A8jV7ju7WZiysEwyFdQj+YyAXUlVtlWaGsemOYUeU14RTvG8mOsTbyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oJqfRWasrTSLzRprTkg47EXv0iZC1wEuvAP++OKeSyQ=; b=XeHYWgWna9zXBnh71kYsyliW1fjK0Mo/WAYCKLxnrrRuTt8uIOnk3Zv3RmKcrTBW9+XaeLsBgy4XBSNe7uvNkm6IF+pggW4fI+Ist7IP/YM46KNj00o4pDCXYrh+JGHT2dJtTjEoD25HpiIgphBGch+vH4dPk5I0ngoYim5MxNLrdvwfrgocwtvLk/ams3ogmIQnYFrMiDNP/bTOMBZh0Cnmy1jsnnZCNvMHtCb4RYlK48Y19Bo4hF/ZuCOTwvrpo7UHiZDRfSvmSuEUrXirrePT7jhDZuj7PLS44pypklQa5SP/mbNlpqVa902Qu7dMXptjLstM5QV4EDYSxKO05g== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:27 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:50 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [GnfvT5xv0B7theCMgpBuqpbyl1wCxLjw] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-20-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dbe22dee-43a7-4be8-e836-08d965068da9 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUPHJiP61NwviEKWmldPD2h5e3tJGJTjx4ndyZqkj37yPzOhwt2fvNnChPozjqodEf6xR4ZcsBuoyu7v9LK9Syb934Po++eDhvNpHTW/zE6UI1dygo3dFPMKxwaKTgHHyrWONhBxzzLUPv2LCewrwp4GXxMjSvqlIHcOh6AtL7gW2AK2IUMX/bEAW5pTeq5925IVB2TlUz2Z17MyFw53SCxURGWRFTtQLZzBN8PeLbPWU2sd880G31OB+NFUrOP1z//ZL29STBmO8Hrr8gx31qDSvCvQFssJvzQika2M9S694VM6dcTMostfBy6bp+WfGo4CmyqqfpBZQtWy7zGlA6UM61PxzCVenH7KevfznxypduTX7nyOSo03Rawb7yH6sDBgP5RMiSzBTTjjQYU2cSmO/9pjzi89UCB+WtbcRv9EsVxmq4Wlghv1xLkXQ+767pK4I2p0F5x1eAUjIKyxItF9pixhR6hb/UV3OIy/PNuDlFG+qmE4d8bZ0sFFUFGtvU8MIz+joObCudxqHkzZaZVBAZ1UEywqwl+Unw0poQ79PCLcg+J4UORHSEXl42Dc8kBg98hYUv2Au9KX1vfVM7+asm+RONZOFvangWFp8KCGK2c3Camga4Pz1EOxXCLzF67M3OjNfsqBbVk+/iRfkKQFLfhw3ez6TOMWoev5XWd0v9kqzIwzw5LCINaapObsGen9rJ4ZY6hwm2ZlnAb9qXJJqA+5qFDxZk= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m6tkLpk+CkAGRIlZ4ICi6rBI5LHEJyhXnDJg+iZiAcHP4RL+1eI8w0JJza6g5EVSLSgR6/PSNKuRDExPdG4poECk7m9EzXZ64S3ebp72swSt73pD+rUaznQnFinDuyk6i9njRwhD5TZv/2A2NgrUGeBeWoHyQBElsCSzPJy2bH7GT3W1bfgg+QQ6mX+MiLNCqWvMdewzxKdWua2fRG77gbRXNBory1IeOKOGoRUQaa/NdFBFlscG38U696DvQ7sEMVvN2pHLK9XpvHClc6ZtbDqqXCil2kxr2yZ5J0W0YHPX7EPf/3BoxGhZJ7pDFbX1+9rN2Iu2p91pci45s6/Wh2YWTmQKFIT/tCZeHETWyaRECHpc2q76ULV954IA1Ql3TszfVqhR0DaMIXJ9wgrQsWaKJDf8Nn05/fJV8qdzZjQ8Muo8udJqwHgOryDb7E2I X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Udvh1M8GZbGknZfoHmDs5BGzWOXuPEfNccOWNx2L+pwqESUzHgtAM7wYa4yS+WcNNsVByI11mrcKxwMvliwNFp68+vbgcq4xj1GEWaLZBkCbRCDyGDj6zMU1bENsQj/gjz7l757gq8Iwsu1XGhoCMw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dbe22dee-43a7-4be8-e836-08d965068da9 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:27.2648 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 21/25] avfilter/vf_program_opencl: Free inpads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: fyijaGvkzG0q Content-Length: 1452 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_program_opencl.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_program_opencl.c b/libavfilter/vf_program_opencl.c index d80aa9be04..fdc6b4dcd1 100644 --- a/libavfilter/vf_program_opencl.c +++ b/libavfilter/vf_program_opencl.c @@ -287,11 +287,9 @@ static av_cold int program_opencl_init(AVFilterContext *avctx) input.config_props = &ff_opencl_filter_config_input; - err = ff_append_inpad(avctx, &input); - if (err < 0) { - av_freep(&input.name); + err = ff_append_inpad_free_name(avctx, &input); + if (err < 0) return err; - } } } @@ -302,14 +300,11 @@ static av_cold void program_opencl_uninit(AVFilterContext *avctx) { ProgramOpenCLContext *ctx = avctx->priv; cl_int cle; - int i; if (ctx->nb_inputs > 0) { ff_framesync_uninit(&ctx->fs); av_freep(&ctx->frames); - for (i = 0; i < avctx->nb_inputs; i++) - av_freep(&avctx->input_pads[i].name); } if (ctx->kernel) { From patchwork Sun Aug 22 00:47:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29718 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp654414ybj; Sat, 21 Aug 2021 17:51:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7+tD99q1sbqDXOYKU5dd/0C3YVw3/+is8D9GoNFB4qhYLu4ewXfEEt+2vDKfeD5ulUVO9 X-Received: by 2002:a17:906:d541:: with SMTP id cr1mr28247898ejc.81.1629593503525; Sat, 21 Aug 2021 17:51:43 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qa35si1439415ejc.382.2021.08.21.17.51.43; Sat, 21 Aug 2021 17:51:43 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=QDbuFfRH; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 06CDA68A631; Sun, 22 Aug 2021 03:48:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075020.outbound.protection.outlook.com [40.92.75.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE0C768A5CC for ; Sun, 22 Aug 2021 03:48:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HjF4BmFQ3Hp89i4jVmCnc+Del8nLGVponAY1MENnU35ioNEIKXeeLA7VOzVrwyaqVOgv3AA0D3f2DnRT6csQPPY3nAlBB3ys2h7Jx6g/ddULb7m22a+LV4GdD9/e+a/tQ9zj2yP6hgnPVZggpjAOs67whMH9KGRqc5RvDvsjLf4hsXLNGBSpmB3nIM/fH/J71leOUhnaJsk0ZQTLwj3w2q/46F9nsOB6dkEE2mu8MY/mniyGnOe+yUQqfPKWslaNrHdC4z6P3i8UI95Y03VIBnwJkE5kE8RffT1jb2ju+rTfpMs4ehvXmAnfchQE1afBDT/Fj+uExkfukVyQqlATWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3Ikr39qAsgc97SZd2udOr0dJf9NlP41OjOmTO7wXaww=; b=fOJZj16ENHavGx9Ut2dVI7NKKz2ojB/Etdkm8S+Xq+D2xcDDui9KK21e9lv6WXJ4eW/kZPQWeFfrJlRaLx/W5E3U1WhAfSuWQbK+oP/DZb82/hL3RAXKtaVyY0utPzgX9tXlEQ6ymfINuDNYs0PqMQRRgzZ4QnwoDiVhED5iqegBu3G8Kb8zRQJELyYqigMPNDB6Rh9LQmJejv1uTwDlcEUCvMOKxnzwIaggi0gTQL15bBHzuNQFmtMb1vNfLpC++unw8VxhuId4l6nFkLcv4yWsskHLr3ii88srFzY3QkZqfGDg+gGXcVAPmFDOHS0T1jNnBOXcDXXHfXQpOo1+Mw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3Ikr39qAsgc97SZd2udOr0dJf9NlP41OjOmTO7wXaww=; b=QDbuFfRH35NzuwEDeJbs3wGu3X5nY09JB4W0cwLOImpnYAAE67t/D0cdyjCqqDJUO1g6kPOvyxSSxfUTDS98nDHDnsTvm4Ywa1+2kRbyoFuKUeC3XtYxldczm3LQ8eYP/BRfG0Q7cZ5c/dp/WnGE87i0f8Hmm0X49KDJAJL3GCF4hXwoHUIZRzboqZALEjNEqWRd3pGAjXQUFeUt1ObmxdfnfTnyDU4RX2AJlb5P6olHyRsGKbildWZnH/AgeEJuXgqndFIKwVK85uD73kihmz/QH8qS6ewHgZR/+j53MP2sWIuAfFts/XD8Uuw/M3I8AAqAcJpFGGRjJ1HqFlVmcg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:32 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:51 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [a2AGH1o3U/Sj5R3TanovNNEw+0q8UfTD] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-21-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:28 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6bfebfc1-1187-4140-ba5f-08d96506901c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUPHJiP61NwviEKWmldPD2hh2QjJlHPtkyJBKXWcWcAT4+cL9gPaXXDUmjnlSDYrIGO4ENnQdQ14Xd3/zxkht952TSKB8pxbAyyiZ8l6n2n+/Ha4q8F/9xzD4Vib57MoDFgD0UpsLe0Q5F89omgeQjHFA6S9ANGdvVLeBdhqcobmPK4nTL7waKRpiByQSadqRR7DJPME4D9wiQUyiPBHScNzFEtX2eI8YZ7GWE+1JVm57S8OY09J2g6AgPlMh2wpPRgSoqEa804z8rhrWmeCAVrhVCU3rmOHXIEcMkuKRoYVrnLjzITnVsOGTbh58XzZfNcStyxce9hK1OyNKJYjUmGFm42LacI7dQy3g/k9alQN+qKNDTfn+rnWkyk/+rpZKj9zSTDImSEDUrF7tjXbZTYk0o4vSAC8S2r6QlxtsfTtx12Z6i9s40ELgcRFfT0z84tsLZlNIhKOwZr+KI1RdLTkdrgo15pjPcewC7ArzTp0Od08q7uLqgEAhlAgJWyHarmKPTCDY7olEW/FsL625FvyKfJDdSlOsL0mcBAUJtDYGIOzlji/2pNlF/9a3XeGxY0XmbXEPfV7D/2NP/riZfCvk3sDVBfdqO+cRGjhaCJ7B7/ccGkL8P2Fov/JOE5qKIap/a4iU4x2RQcfpHwCjJsjQBeif8AlMO5QffEko2fRivwN+1fCwmLN87essQG1TCFMSvndeGItdwj28uaU6siAKSXqCaUhJg= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lMnX2QSzkvJN8Ee412as79Y3FyKYv9j60xoc29GBCkVtLJ6aRggNXpRDLxCoYHCn8eWKtbP/m7qm7FhGdS1xVnW/3VK6FM4IS6YZ5up5SWCjehoc3Jex3DE34d5PTG8upZUGov1Z+uoh2nvf/u1864EhfNCHMiV47FEAwHMJEXb+7pjMw/qG5QuRqAr9Z5seq2i1kYKMZiD5edbDjJ5lP8+cQJGxmeEevK037ris+QeW6qK5cg8P0ZdT03eeE6ZzMsU1KQFN7ylC78Zm6jQ6OWcif3n2/aq51PkB/jZRE26awXNfEPYttol/j/P2QikPCPZi5zO7e0ao/MDVX1VLqAE5LhvdS76KqxJ7kLI5SNfUP1wrIaFUtDMFg4pypoU5k5FjIeppUHpLwoonRpuPh+Wu4CGCinNuSW2PhJWlKMWbljoQTa/bpfWpKY0jvhYo X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dm0mOYEywN1mH2zwBGrBPL390KCdidvZG8CHcxMLmZahHC3WdSPb1jjrXviNjuEfUqhCMjoHbZGQopr+PTfxOK/nuxEqVYnneiAh9g1nzIFcMzG+5AVe/eCXq/Xc/hnVruLXF6MUnea16ooZ8JS02Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6bfebfc1-1187-4140-ba5f-08d96506901c X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:31.3757 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 22/25] avfilter/vf_signature: Free inpads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: TGEyGW7ESyBq Content-Length: 1234 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_signature.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavfilter/vf_signature.c b/libavfilter/vf_signature.c index b8339d7442..784869a7ae 100644 --- a/libavfilter/vf_signature.c +++ b/libavfilter/vf_signature.c @@ -664,10 +664,8 @@ static av_cold int init(AVFilterContext *ctx) if (!pad.name) return AVERROR(ENOMEM); - if ((ret = ff_append_inpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0) return ret; - } sc = &(sic->streamcontexts[i]); @@ -730,8 +728,6 @@ static av_cold void uninit(AVFilterContext *ctx) } av_freep(&sic->streamcontexts); } - for (unsigned i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); } static int config_output(AVFilterLink *outlink) From patchwork Sun Aug 22 00:47:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29705 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp654294ybj; Sat, 21 Aug 2021 17:51:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFgqLJ9A6RhUl6e6i7xZXW1yynu0wsdZXenlynvDM9kZSTgdtCtamOnqwzirlPzOeWpWeO X-Received: by 2002:a17:906:30d0:: with SMTP id b16mr28400788ejb.495.1629593486904; Sat, 21 Aug 2021 17:51:26 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p26si10072178edx.85.2021.08.21.17.51.26; Sat, 21 Aug 2021 17:51:26 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b="B+g/Qfd7"; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2C23368A5DE; Sun, 22 Aug 2021 03:48:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066050.outbound.protection.outlook.com [40.92.66.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6417168A5D9 for ; Sun, 22 Aug 2021 03:48:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b4rpxR6/JPXFoGJzfwgHe1T+wOvE7mGYn8w7a03t6IUnYVYG711QrI/XAg/Zb6jIxdZBfsy0CfUgGTs2KOPSDYGXhDSrevsKHmSCOCfz2TphdUGfOA/VUtPZX/JKmEy5wgqst0kHeaO+o2NLOcKU4VVIZFkX3jGeTcPcrz1bYjRCXlgc7pf7xmQB/CdMZAP1ZunBGEu0HEGdrq4uKO3Ay8buhe7AkWDUViYvN8g9A1ipZshMNBe5RvCUTYQyQUrVEsBn6BOM44DA/CJ7aujmY6bj6IQ2HsTMabim0ddjU6u7OXslsXY39mxoxJ0Fa5WDA6CeOSuX0+ONGSBuQV2ZsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qrHxKkMReYgwMo1DHjm1Y4liXZI8BjugFQgaAXhdrYg=; b=EFoogqAWIGtusGyMkUsjzZNuyI70R1rnDWj8I7ITlR7B5CXc2IovOSkt4dTH+HfoqyO8byFk6m/Y82/7TCFhrSUc3cpOflRoPBx95neM2pfCU3faOqw45TCQ0hyfXLhb5rs/bBFPQt3gawhR3uObAdM97e4RlsbCkxvjK+w+SHaP955hisqnzFbponOcD2omkKfRSvWsZWduQsrfug871x41l9tAzMsTS69K6K4TALM8MHtSWQaGyMYcpQXbWbdx2TcdnjeA04oXLOQvlPxeIClNBG2ERYGfKxvrupw6GaCbZ/VVVyjChAuhCnVuvdPBxj0xGF1kKKZIGNkTC3sHxw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qrHxKkMReYgwMo1DHjm1Y4liXZI8BjugFQgaAXhdrYg=; b=B+g/Qfd7xy0Me31g3+o5huTEevaL48yRsvxgxZ1DUQGHCs+YB+m63CEqdaplgWh3McxxKdcHGdHXpm1xrMHkG3qUt1jS3IMscNn5LnBvQolN1Apj8OjQUsNE2Ax7g16ShlXWFIpTMFfLNg0EevrT2zsn9uPMyfntUk27aA8cwi1tHwj2oZGJuLBJihvhrgB6lK3QcUlnp5PCWRPyl96UkDuW2YkTG6bqJjEneY7DrJ+dBTfxXL2WlbKshOLcbwiQrywQdN3LZJYk14zYt3+sYS6N0jT6XLOL9gLTrX1k2eHcIwOFhIhLiGFKzxAC7pDKhP4R1q0xS97ipYefD8wPwg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB7296.eurprd03.prod.outlook.com (2603:10a6:102:104::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:32 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:52 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [8FFACOExCVOduX3A2m9W45HJUWaQRddW] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-22-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f265507f-115b-4251-6f8a-08d9650690cb X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJwWgviN1+H3b7CoJreyzU2fis50jOBlNgHmBjovl6gUZRGUOU3OB1W29kx1jcMmjRciCekVl9OM/kCMbTB4CV0OqYxm8U9AzgrLARdIfND74PWksV9Cm8j4jsOMAFReTWcsBqt+CP/KDBkss0pFzk67uxgb73Fm7vgV4UI+wz8GrQJBiqaWiIEYXKOI5nkNeLBgWoJBlBFL61s8/wgQsnCRlToRwkFfEGmoxVljc4mvFCfE9AOLAIbG7SZsy7f/+n2cnPrd2DW86eoycbrjCAkISHN3dbUxY2pgnsTujUc4vLNo+6+3X+4rENDGmwnVyc8wVefsqB8/3goETTpquaVmWWUo9rvU+PyACaV9KRXLFibPJ6m2ZupbU6fXmLiwaLcZ0yi7Vz4ntttjhgCyi6qab7zQ1mPY98GEtGkzcQWU9OGxTqqpprr5g4uAGyT8O/lUjkK0njp7y5K882kndQ0D6OBd5Jwz+MDYibLXztz4CzEwPLqMVq9Si0sa29EMnWo+3SOjY1LthLjZLHy4gXTDNbpNXyWu6R/rcbst9/Pk7tdGfHcI/RVCoRoxUywYRDeGFRhWpyePt2PD2vtJnL/dTgCa9wisOG1v2KecQn90XhbQ0GF/w5sGeTjKsnUOIPemohYaPq3vRyWGLjQ0gfBCXnTAew7NL5njERxoGbMilW6BacIJfco6nhzvB1A7sBhJf9AWjtwcg== X-MS-TrafficTypeDiagnostic: PA4PR03MB7296: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c1C3oKzbt9GSYyiD0njwymTSioJb6OgIwHNS4/mbAdCx3X48ycUbwlhGZmcwJPqmBO1u/m+2uChytm8Uoc5V74Skc11xnmHxgw0MtQNU9YPVluTqJkvjMx8cwdX4ArYRWLnqI6NpaTW7LzIwTEYtCCgn8eb5nOE10l25XLJpOi5XGzYGSr3GixF4/kPXTlRjuciyRLaSKaUfpapIlGpTDWFCcljEgZZmBNrC1DMt84mQ85pQPqY591hCruL3trJhiBIi4PcHRWlOzvhuDO0kafeG2SthiLoHFVzDiUlPz/4zrLQYjo2/bzI0L8TpSmiF75JiQ8o/vso//trQds50rxJi/s5dWOzIbHfArQyfVYjBnF7JcpWMDoQMG1xFKbZowDVPpFgt31tjdYDx+JP30agaMO4UnYbLs4UsNRNR9S+KVl3FbFM8fp2TgxiVHVRJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: C08+wubYTmdB6mEofmfkdDkUyGNrla1jZ/sP4TG7uNFVWOLqZDtf9vWAJcGbOximB4oDcqzUYlyzrnHLoc7KdN42kSVvsmRxWN82LuWtgl6bCm5A05kOwVIbelK3PHEQaWdedEc9edJE4I3OkXnsRg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f265507f-115b-4251-6f8a-08d9650690cb X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:32.5018 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB7296 Subject: [FFmpeg-devel] [PATCH v3 23/25] avfilter/vf_stack: Free inpads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: nxnAkeCrD0SX Content-Length: 1312 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_stack.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavfilter/vf_stack.c b/libavfilter/vf_stack.c index 8d3360169d..a87cffc491 100644 --- a/libavfilter/vf_stack.c +++ b/libavfilter/vf_stack.c @@ -123,10 +123,8 @@ static av_cold int init(AVFilterContext *ctx) if (!pad.name) return AVERROR(ENOMEM); - if ((ret = ff_append_inpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0) return ret; - } } return 0; @@ -372,14 +370,10 @@ static int config_output(AVFilterLink *outlink) static av_cold void uninit(AVFilterContext *ctx) { StackContext *s = ctx->priv; - int i; ff_framesync_uninit(&s->fs); av_freep(&s->frames); av_freep(&s->items); - - for (i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); } static int activate(AVFilterContext *ctx) From patchwork Sun Aug 22 00:47:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29707 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp654367ybj; Sat, 21 Aug 2021 17:51:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/f7muwBGFU6JrcmtBN92iJAtBUvdoAat7EqWumuZmrWq6Y/9bS6v+PLN0ByS63IE9ePo8 X-Received: by 2002:a17:907:101a:: with SMTP id ox26mr28825197ejb.282.1629593498002; Sat, 21 Aug 2021 17:51:38 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id eb13si13432544edb.405.2021.08.21.17.51.37; Sat, 21 Aug 2021 17:51:37 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=PsIqe+5M; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8951A68A473; Sun, 22 Aug 2021 03:48:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066050.outbound.protection.outlook.com [40.92.66.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77CF468A5DE for ; Sun, 22 Aug 2021 03:48:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Aslzc7SZL441HG3SoaRNZ9yCprI6UzGLIF6wHTn9Fb8UTQ5l/uUyWiO5753ONwRc7nQvNOEU1QqcCWWBrOpmA+nthNey4AkqE2ZcyfLmsyVUy0XOr1/LLnLnmgzDGVn7tzlX/tfpHUut/jtzNty8bgiboaH7HqUx2gArMOoPqp7ew5+oLi/e/z3EobnmrrZKNip6Di+p0DGQ3pDDfTo+LnKdAVbfNokEIJ4xvHLl884xFxBZ42hVRRarFGEhIlwQ1qCd88utw2sjoIAmYwYijnPxlAGb5rqvcqcFKtb9MKd5rXWaQjm7zHUTm/NhHUjifD3h+o0Pb2HI1dFk0V+5sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A79aTKyNTpl6Ba/rY8I73fZQIWnPFMZpI5VnHxwIP6Y=; b=GXLUvvVVMRwxvEedGxZudot4NjmGDpYZOAVcX/Fo5XicZDDMMQdBehLiLOBQLpugrgxQMjU+CO0M3YJPDDOPaBMsi/tsrDu+PqAqJtUWrvH7SsuGFfqZGKtyE8r2oSL53WLVn5fzSm4SvmHDjiH9DmF8QtCFgJacOa+t3biRyc/hS92CR/uRfG1glbIusQeb8lWWKQ1bNdnaswUdqdcNIIPWMN2e6ReQxWxLJCHS3C6k6YcozpxrZr5jeWxwf/UZ72fpZe8tehQQIPjkNw0ulGrnvUZiSo6a9RHjS63PA6aWz/FouUtEgH4xrSyj/CPHrHn2+e2eLj9Wn30HMtiFrA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A79aTKyNTpl6Ba/rY8I73fZQIWnPFMZpI5VnHxwIP6Y=; b=PsIqe+5MdVd/p9cH3L4Emqqc+Nz1mSlPR2ilhOzxkE1mSIbez77ER9xlzOiah77QfrbNIFKfDBwyEvYXr11IjAV/C3QguNHILm+xwHpnBKk5KSNtsRgSgOUqjdxzeC5tJud9dvGUw/y4MGdmVPDRytMoLd6UyyCAMbv5trEBm39LjPZn8YZIW1hfu35zjRR79loGFsr1GCzFUFHmGnX1NIKBg0P/+kpmANdVqLcB5XRMu0MpwXRAUxR/DrNtUBqTDfHTHSs9Ppl6yLc10FPbYas1SV/lh7I0ZpOBgzU+OY3YPOpWRZx6r3CW15xSbxvDkY10lotB9aKhJ348eh/MbQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB7296.eurprd03.prod.outlook.com (2603:10a6:102:104::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:33 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:53 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [VvZwVPEwet7BihA2MaR3i2zFZHcGFHY1] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-23-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 678ada5e-f9a9-4580-fcfa-08d965069161 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUPHJiP61NwviEKWmldPD2hh2QjJlHPtkyJBKXWcWcAT1EKcTEQj53YqeVzJnnXl9cWNoY32DNrNfS/F02yLdQRmyUkumkdgGxRXfk6QfAXgosQ8LJwacgOScmtMIEqOsQTmTtmb6g5EFVdIAmOCIa6L1p9AfIBb+18xYN/Cwjn7xJ99B8D0y+udjAUBdCwHzcbopOrF5Gij2ZeAZX1Wyvc4R/xnAxus0dgNxPFXy734VUZ2e5TliWEX2IBbWxw2+V9Uc90OKp/3l6gQmNxBgNnVBYqviZC/GnyPQR5bc0PNSv9rGbnPu4o7Ldv9bE7UZrQHoMCSZ/JL75w3gO5huIUwifK7fG8usD0frAP2wbVPeF66c4qDC+8U6Wzbi9Vh54t7IIxMu1NI/lxsxex8diUdII/iNOydwVWOBxKAe/njMp0PYtRVeIzxnfT+DcZ+ED95MWXDJ0r3ywivJ7f0+NMZEAc/Rg48gCCcU28Zlmtw1CrkS/yiSbB6ftS+/xXas8p/PoXROtoJZuSeY5OFjSJC+kmab8tFtFCa3U24cRROxPJGoFnbqkf32JE9ZsbiY/7t3S78mdM0/xWyi1xG8uKsO7TyH53yubSEB1NisIrpt8EBxdocr/ayG+22hd0jhgp1nzdgz9uQ7NfcP5odlnbmGBrSeVsftqRRr14qqTsrjbeNPkgn6JTvAOp+HBMOJJi81BUlJtEwaPaCZ7SGwh7chYD3GYdKDA= X-MS-TrafficTypeDiagnostic: PA4PR03MB7296: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UBOtu9TGphVhwbJwrbebPi32ltG4qxT4cUzQhjiWzNG8GpAt+HUIutBjjLBr0ztN5CS7N3zISon+IhwdqRTYnXa/YsQFJThJ/zO6rJDZpgjf3ycBwiGM8/y3L9d7XbPFM42GTig4AbQZMiaM0m/VGLH8kmlKLRaeEJiL3gLDSj1v/lpf2c6hTHYojO5Wcql0EacqECQOmGYoFlI4HQe9NtrQJuO00+TH0YsRiKDlsOlOdo46+P3P77pAiZ5DMvqty75HL1z4eOxfo8AtVfuaTXjYFKDMqscFoFSm7T1qwN5/VM7nmiAg32m7e8xbyi4EecUaWOP5JXYEfAzpKhIqFUSVW2wOfvm8XeEPwJpBfwNkhMgVIRjoxLh5SyzbLMT96iGJZ0xPmsx5Kp4SDYzBOhSMSRigcI07TIujCHmA6uYSUFkTs29E6AAIXM85L2mN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pOM4FVZcLswv/+/ag7762EKHgI281APYrdiWihJE+2Kxtt0V1XeBGlWwBDapO71NwVAHSGCCrpqWje09M3M3kZ6ZALjsG8P7AVP2iLzVWCQD2B855fY6eH7JYZqmUMuClLq5gxnlzD1kDrYayTBLHQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 678ada5e-f9a9-4580-fcfa-08d965069161 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:33.4924 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB7296 Subject: [FFmpeg-devel] [PATCH v3 24/25] avfilter/vf_xmedian: Free inpads' names generically X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 8WaXivlZbb4D Content-Length: 1327 This affects only the xmedian filter, not tmedian. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_xmedian.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavfilter/vf_xmedian.c b/libavfilter/vf_xmedian.c index f900720012..f8e4e4adb2 100644 --- a/libavfilter/vf_xmedian.c +++ b/libavfilter/vf_xmedian.c @@ -118,10 +118,8 @@ static av_cold int init(AVFilterContext *ctx) if (!pad.name) return AVERROR(ENOMEM); - if ((ret = ff_append_inpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0) return ret; - } } return 0; @@ -335,8 +333,6 @@ static av_cold void uninit(AVFilterContext *ctx) ff_framesync_uninit(&s->fs); - for (int i = 0; i < ctx->nb_inputs && !s->tmedian; i++) - av_freep(&ctx->input_pads[i].name); for (int i = 0; i < s->nb_frames && s->frames && s->tmedian; i++) av_frame_free(&s->frames[i]); av_freep(&s->frames); From patchwork Sun Aug 22 00:47:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29704 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp654474ybj; Sat, 21 Aug 2021 17:51:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXhUlw15Mc18LLV0zg7d6RF2LS9D6WPRNkVOyVqoby5Kmob3RqUfRLDuzkz2GuM9AWvuNf X-Received: by 2002:a50:9b52:: with SMTP id a18mr29854525edj.165.1629593512117; Sat, 21 Aug 2021 17:51:52 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m16si1610778edr.432.2021.08.21.17.51.51; Sat, 21 Aug 2021 17:51:52 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b="MyY1E/GZ"; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 284E968A642; Sun, 22 Aug 2021 03:48:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066037.outbound.protection.outlook.com [40.92.66.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 958F868A603 for ; Sun, 22 Aug 2021 03:48:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dQTKqQiCBvmWoTxe4nB9VFRbeVmGZYqJ9ULDRXuEt902f83ZPj1wq9YFEVhVefNM2LjSd5LbVFK0Lmyg1gYBibUv+aHsq/vMTfjSm3Sj6pWXg3SzCxiWVhjpJxa2woOqYoG3Mbw+YOaYOOdapDR8K3zDYbD/mu9L/NBCZQr13SW0n4UMDoHkhg7QHaIVNtUwcQ+sXCHrGQFkj+11W6k66IrG5OCTQVt6pdYwmLhIuiPxuqpsYnkbOABtV8UX4bfLaYnds3AChDEOIblJ1S2TqN57+8zXjRWXvkfp7n3TIUwdBs/gBGpZkINhP3f4w/vF64UvKXj4GVpVEL9CV0ds3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LUkZ/AwUYJCyDqZSP/oRNeso5HOyNL78Kc1PohIywx8=; b=VifeNIjgugb8Am9hvZFgiZsvBk8adhARHQ2Od5iepYMjoLTWXeOjET2Ysxt6t7wvC1WciL2LyjpmH3YzrFEazlDMGuerMhNYW1g8NKE5u6m+/VACWr4TJ0Fy1qkxgteWfCP6eC6BjbaOCpFfEXKjarIRG8yOkGlTapTojJnAc2yNzfzP5bwuHGcTxK9TRakZE9wtlGwDXI1GNlVYdV9X0qxgxPwSng58lZkNGd6BKJbwv9uWWfrzRTcJwIfxkCHmk5VJPmAddkUY46yHfG7TtuT04wJSIpxanvCwcCt4smXxHEYwrCMVij0rFUP2kYKOmZOziatTFQAPppDvKmoA0A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LUkZ/AwUYJCyDqZSP/oRNeso5HOyNL78Kc1PohIywx8=; b=MyY1E/GZ/IqMA+E7glSHJHS8icIYLpzmLwobKD7wrcRi5hwpUberOx+dJQ1cqdBtMlbt6qwo0k6KcuPVznS5RhfKn/ml8rTZs8as7bbyrnPsdHzdzOd3FN1XH9EwsBMfi6BAjjnP9cHaub953sh+ckB1H9VTOLCibEjwJJ0MntuWCpgiR6xjuEnwlFmFvWs4e6fxsitVUp+P7K0mA9qe1px9hP1eIxvTeY/PHRzFewe4uDIfSSDDkURHsxKibG8PER0ap3qdGKQluw3ZICGuyUJaxsqMv18yeoLR5KTOhNhzT0TWFMiV7KO58Al8s4nx2wT57+juytRkiwqEKlhkpg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB7296.eurprd03.prod.outlook.com (2603:10a6:102:104::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:35 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:54 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [nwHGaLCxWiAPJHFJNsPIM08jztbSG/g4] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-24-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3068da99-62c5-48da-3bc1-08d96506923b X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUPHJiP61NwviEKWmldPD2hWtCX6duWabdmmTZ2tg1pQgUy4GixgVJ7vG3qyF8zRYk1aK66Xsii2y2DQ+0Bhvrtdl3Ptfkl9sDg1LrHAhOBSs4yMyY11bGcFJTbqIA1ylU2SQZrlx/R9zoDDIARhZDieJUYh7mO+kNffFEPYtsY8p88i3wUxZDzuXEKOoZjrb2aekyr+NTrSev64tG6N4NylXGIuNY5aOhUfjx1T2sW1MtXpKa2CUGcpbUuycCALve3kUPpLL7BuT0aXnmd4B50ru1HVM60kE3LOXvhIAHD7WdTp8AcipBRC+WBXbkL3ReO+G9qcx2Bhb04v7pIoP5UJXdTlU3NPXnFtVa+Pff14qRM5HcZ0gesO6ZGkI1VGYvEsngKpczky+jTOjtDwfJL4rD+4meTInMggZGpsjBtZRK8WXU5W6Db7DAUq73SH7dJ7mcTyfzUOjMDFPI45I3Zd92h5dEHW8nxjqNvU9od5Kv//QHZFoD8vLQjkAZSFSrkCtz+QNMHwLsHw2j8Q1P2XoYp/yELRTWeWFCYaCJmIB416PJC1LkRITxcr6swt0B+o5Vm7Hx6UY6vpLZsHxeEjvbMv6zNWA7joGOj40oPE+4N2qsytJtQH51hpEAH3pOaoe23rvIt4X52Tj/lG+rE1H6ZIZumShnxqCgZMb2Ii8ht1kTDGleUl9XztOWPTAwTlq//V85Pwc4FUETBrTqKiHjz/0tQEFU= X-MS-TrafficTypeDiagnostic: PA4PR03MB7296: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UkEw14lDAgSIUHFNq1ORdXo/Xb+NXGvcuRsQjO7cK1fhB71/ggHDyZmUIn35U8JQ5WwvcBbpttb0CidZmU+uEORgOYxnW0zu3OILK83glwNA1SKIOiEvUl/TSMPFUa2/c7AvoGHTS64N488hPYZiTs8V3gnaZgSmIKi+bdwfL5L0MZr2WJMpFkuCBLQdIGL/fP0O83vQGme7cNnh7yZN6AiViCuZdsnf66O73lEYDlIt0BnbESnOfs4nosEy+DaaQaUg4RHbFzIy+PvFByp+l2u/IMKeGdOWMFHcGGmGFz2IotuwWOuY1F0Oecx4wms0Jz8dedRBgiMxSGrAUkn5SpKQjH3SYGEqvkL7pSe7trDJ2gJEfYVkyis0q3RjpCNq3pIxdVthSsSZ7N9/QY6xvGgik2s3mEhRaaE39eNiYE7i5Zvoig/CSIhWRxMm4Nyd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dI5N9pjL5R8x/E50wti06zE//awtVRYKWXGV+rPQBrs3O0WtpWtHQtjwNEs0RfXo81z2sZBrKbJSVrvFFDRZEpM7cNaMFBAQXzOCdHtVIEE/JG/bW3DpLuWQtj1gHXf9fs4zpexjAArW/4AM7Zvu7g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3068da99-62c5-48da-3bc1-08d96506923b X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:34.9211 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB7296 Subject: [FFmpeg-devel] [PATCH v3 25/25] avfilter/vf_xmedian: Split portion of init unique to xmedian off X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: FmDabksZiHLb Content-Length: 4327 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_xmedian.c | 56 ++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/libavfilter/vf_xmedian.c b/libavfilter/vf_xmedian.c index f8e4e4adb2..a9e3255a2a 100644 --- a/libavfilter/vf_xmedian.c +++ b/libavfilter/vf_xmedian.c @@ -39,7 +39,7 @@ typedef struct XMedianContext { int planes; float percentile; - int tmedian; + int xmedian; int radius; int index; int depth; @@ -92,15 +92,9 @@ static int query_formats(AVFilterContext *ctx) static av_cold int init(AVFilterContext *ctx) { XMedianContext *s = ctx->priv; - int ret; - - s->tmedian = !strcmp(ctx->filter->name, "tmedian"); - if (!s->tmedian) { - s->radius = s->nb_inputs / 2; - } else { + if (!s->xmedian) s->nb_inputs = s->radius * 2 + 1; - } if (s->nb_inputs & 1) s->index = s->radius * 2.f * s->percentile; @@ -110,18 +104,6 @@ static av_cold int init(AVFilterContext *ctx) if (!s->frames) return AVERROR(ENOMEM); - for (int i = 0; i < s->nb_inputs && !s->tmedian; i++) { - AVFilterPad pad = { 0 }; - - pad.type = AVMEDIA_TYPE_VIDEO; - pad.name = av_asprintf("input%d", i); - if (!pad.name) - return AVERROR(ENOMEM); - - if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0) - return ret; - } - return 0; } @@ -270,7 +252,7 @@ static int config_output(AVFilterLink *outlink) FFFrameSyncIn *in; int i, ret; - for (int i = 1; i < s->nb_inputs && !s->tmedian; i++) { + for (int i = 1; i < s->nb_inputs && s->xmedian; i++) { if (ctx->inputs[i]->h != height || ctx->inputs[i]->w != width) { av_log(ctx, AV_LOG_ERROR, "Input %d size (%dx%d) does not match input %d size (%dx%d).\n", i, ctx->inputs[i]->w, ctx->inputs[i]->h, 0, width, height); return AVERROR(EINVAL); @@ -297,7 +279,7 @@ static int config_output(AVFilterLink *outlink) s->height[1] = s->height[2] = AV_CEIL_RSHIFT(inlink->h, s->desc->log2_chroma_h); s->height[0] = s->height[3] = inlink->h; - if (s->tmedian) + if (!s->xmedian) return 0; outlink->w = width; @@ -333,7 +315,7 @@ static av_cold void uninit(AVFilterContext *ctx) ff_framesync_uninit(&s->fs); - for (int i = 0; i < s->nb_frames && s->frames && s->tmedian; i++) + for (int i = 0; i < s->nb_frames && s->frames && !s->xmedian; i++) av_frame_free(&s->frames[i]); av_freep(&s->frames); } @@ -362,6 +344,31 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar return 0; } +#if CONFIG_XMEDIAN_FILTER +static av_cold int xmedian_init(AVFilterContext *ctx) +{ + XMedianContext *s = ctx->priv; + int ret; + + s->xmedian = 1; + + s->radius = s->nb_inputs / 2; + + for (int i = 0; i < s->nb_inputs; i++) { + AVFilterPad pad = { 0 }; + + pad.type = AVMEDIA_TYPE_VIDEO; + pad.name = av_asprintf("input%d", i); + if (!pad.name) + return AVERROR(ENOMEM); + + if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0) + return ret; + } + + return init(ctx); +} + #define OFFSET(x) offsetof(XMedianContext, x) #define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM #define TFLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_RUNTIME_PARAM @@ -381,7 +388,6 @@ static const AVFilterPad outputs[] = { }, }; -#if CONFIG_XMEDIAN_FILTER FRAMESYNC_DEFINE_CLASS(xmedian, XMedianContext, fs); const AVFilter ff_vf_xmedian = { @@ -392,7 +398,7 @@ const AVFilter ff_vf_xmedian = { .query_formats = query_formats, FILTER_OUTPUTS(outputs), .preinit = xmedian_framesync_preinit, - .init = init, + .init = xmedian_init, .uninit = uninit, .activate = activate, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS |