Message ID | PR3PR03MB66653CAEF74A0790FE6E7EE38FC39@PR3PR03MB6665.eurprd03.prod.outlook.com |
---|---|
State | Accepted |
Commit | 0ba9089aec43818b30d688810771eee2609f7894 |
Headers | show
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: <ffmpeg-devel-bounces@ffmpeg.org> 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 <ffmpeg-devel@ffmpeg.org>; 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 <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:48 +0200 Message-ID: <PR3PR03MB66653CAEF74A0790FE6E7EE38FC39@PR3PR03MB6665.eurprd03.prod.outlook.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <PR3PR03MB666583245B8DCA8E1C84F5AE8FC39@PR3PR03MB6665.eurprd03.prod.outlook.com> References: <PR3PR03MB666583245B8DCA8E1C84F5AE8FC39@PR3PR03MB6665.eurprd03.prod.outlook.com> 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 <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: ufydyuEfutQN Content-Length: 1294 |
Series |
[FFmpeg-devel,v3,01/25] avfilter/internal: Uninline ff_insert_(in|out)pad()
|
expand
|
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
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[] = {
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavfilter/vf_mergeplanes.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)