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); }