From patchwork Mon Sep 13 23:23: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: 30225 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4467109iov; Mon, 13 Sep 2021 16:25:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyRfVBlt6L3CeSMj2V2Jp8zDUR6VPj8XE6OW1r3R9nVNNW0Pfa17c7W7BXjejsu+hfDEblC X-Received: by 2002:a17:907:1de0:: with SMTP id og32mr15411557ejc.348.1631575526992; Mon, 13 Sep 2021 16:25: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 eg14si9711667edb.507.2021.09.13.16.25.26; Mon, 13 Sep 2021 16:25: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=Xxjh3b8w; 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 54F7768AEF9; Tue, 14 Sep 2021 02:24:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071040.outbound.protection.outlook.com [40.92.71.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2EA1068AEF0 for ; Tue, 14 Sep 2021 02:24:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MfO6IBMnZRX5V26zubdTnm4EX/1GTolnr0QlNbtuijCmWL548f4deCdNEkMopqVKHkpwkwy/fQoNvbG6p83Y3bNHDDT3yupKUG6JB3+bkLh6XAsXdPII4ZDE6PgsIhnciOOa8S6HfJDQz5gngd6JQUuJaSsjTtDQVWm8rilQxhH2KFB5Mma9pYM1ltV9XXi1kEnxTD36diiAp8Q3Qvjdx9r9n1+vatBhgodJ5muGIhkyoy/lBxYax7ZQxDPwDugkR/bE/4krLPl0y2Z0T7wBKoamxUdG6PWqC8SBdFCCgQ7ZoEVdpEJDRH3MT2M0+5R+QHx+bDCM5sTJzE3zso28Jg== 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; bh=VSPZBMg7jFiq69Dk0P5K7SRuv9aNWvfthMadoXGlcPU=; b=n3qOQ1bcIDV0mLs+vOcBYPNPefzGyE0ToHXgs9JnaH6tvqtu8mwF4kaUUX8x1ZEIE2MKhuF1is79yY2Pj0u9Hwyz1HgYdWQ3jj86DXKh50ec98BE5UjkEgpjgIPdR8XJ6qSfUAFvpi0juxEARAiORMHTwgd7QtXJdlXsRfmqGx9oM0NTU1G6CVjfHqr0CDjWNT+aCqSgEyuAxCQXq1UUrPA6fHkLdX1TW7nFD1SlJlMXLn+2ZRiQ9ZmxBPEQ61x35nWl14S5d6OjVZ53FOHSLXkes2Ph55PLZFH2OWasA8JJubs0LuD2gmEZpvLCkpE7WpxG+v12qO8nwhPAJa9M8g== 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=VSPZBMg7jFiq69Dk0P5K7SRuv9aNWvfthMadoXGlcPU=; b=Xxjh3b8wMCLSL7D9UK8NjEqZ9ZLJoL8k7rlKK5sB8nU2iAQEiWnRqwaJmqTdKbhcLdJOM4OHJnkmHxXDHHzu9q0C+eov26HuW5QbL5Y7IPzfrZ6FIBMxlwL/Ytv/E4tT9gyNrIqdScW1o7SgXVMv2C98TCfrAbl5o6p+UJZ/KfBaxhNiECEkeQM5rrH6kXEHXJGzRNtbooeusLXFs+4MQw/cVgpTo2W5r5f103gVuqd0ooeOFpOJgKTMC9eRIdl1Ue+oljPIzPONvIdEBJ3dzQCVgf3pDkaJFWeYuaqJTOoYqU/UuIeB2GAEeDzVjnTSMdK+oazZ9eSe4xsYN1StUg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4216.eurprd03.prod.outlook.com (2603:10a6:20b:d::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Mon, 13 Sep 2021 23:24:33 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%4]) with mapi id 15.20.4500.019; Mon, 13 Sep 2021 23:24:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 01:23:36 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [x+n7+00tCpOXV5QpEldgttQe2fAKDuPd] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913232339.3115725-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 23:24:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 50ccc1f5-7f2b-4b5b-f829-08d9770da4ed X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXSr2fKdz7sYt6AgME9bwCsuPOVNupuaQBDVwb4tOdJyBAAj44Ra/edVF2bNXegt9ZHp1UUKhtOMIVtKXlVXHQsEHW7p3hWNvV+kbK8aHFqrtR/HiRW5jF6luMKlDALluW3PRw5w6LgpJH7Ci9pgGhiPwoqbYUb+rJLEhKP0+Pr1qd45EugQdjrvXJ5MsHL3Wa8rh/NA+s+OQJJFGMSwd4WQwohcs6dwaKHvT3pOPtZyRd+ISoRd6yT7ycU0OOzXnSOPiIxOuBDO4MwIT10QkbphfN/tUtYRRFaUWZfbrDtW+ub26Laf29rUJ7E+Wrh0soCYvAGBxzXiwtmBrdg7978heEyA/BQIcPPskNXGAWmJS/rsPDJcu4jK2bCEGqhL2RDl3FbLbmls98zulQMQZypI8fERga+QfRYygPfGakkQu7OAC8SNtEhl0iqz0CNTYnTQfswhMGzFwNYplNRQUaokYD5//jRChJuS0hrTW/jVO4HXu4ArmEhzgy9iaj19b3rqm/dB8nVNkaU7PxIYe9jM+Ek+6KwIJvBXZs1uAerqumENMviFoW1qqIs83zvue22WFYjPGwTyfw1wm+yyXnj8cFDD++IRJFXL/rTQxrnDT/M+oFWu8Jdt9lRiAHqIAsZ7JJk+Ur4XLkvbPip0/Rqh26oKIv+olrXvGuJ5uJov+c0dLKHJjHBkYP5A3w3Cmkskg0SyQnpuh8Q5ml0I9Omdi/gVTzQhjc= X-MS-TrafficTypeDiagnostic: AM6PR03MB4216: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g6LZw+7ZrAAo/WPgtZmak35pliTnYrsgm6gCHd2TWvEclNKZqRwLsdgOgBtpumDY0HhQvjTxQjqufv85VKME8hu3fs8bId9/s/3i8b1rEiTD4zGAaiom9Fy7K/gaeoaacXfg4hb3iU4fc3K5G0+OkJ3cMWkFCPg4SA11VVespobWWrPt5hzXcardu8Cw1KynOped3Ms4mkU25hGP3eQvhPqWkYiCdch8aJRC8pmgbHD9uymWLb28DVp2WdIGTrxZRHAt8iiMD1RBS/faNUJaxrELb+825cRxc6QdPYjXFGXF8uPI/F1/FMQ0VxpgXQWSalCLlb0VfoRNreCGpE0EVKp7kEvr59bgW9i8uX7l5cKZ8h1xsnLEuiReCHSTKxiflhgwjDNVwSwoRy1XCe/O9bUeFLgmFH8PbQT3BzKD3E91Cu98xentLQCgk30e/QA0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: a4shL2WtcRcqpXoPG8x1yc4LebnAET89Mn6k59RSl4cfOZOHG94hVGtLOE3A4xl6riaBRJ6ZAp3YPrG4NZ0iywLRmIKxR/o7IwuIXYAsFrL0zVn4a9JjmA1kOCyWHDKMoN6+oeCTeplS/DaMOWNnEQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50ccc1f5-7f2b-4b5b-f829-08d9770da4ed X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 23:24:33.6956 (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: AM6PR03MB4216 Subject: [FFmpeg-devel] [PATCH v2 11/14] avfilter/avfilter: Use AV_DICT_DONT_STRDUP_(KEY|VAL) when possible 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: jvca0FCxoO3f Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 11d4e01807..cc499fd5ed 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -822,6 +822,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, while (*args) { const char *shorthand = NULL; + int flags = AV_DICT_DONT_STRDUP_VAL; o = av_opt_next(ctx->priv, o); if (o) { @@ -846,6 +847,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, args++; if (parsed_key) { key = parsed_key; + flags |= AV_DICT_DONT_STRDUP_KEY; while ((o = av_opt_next(ctx->priv, o))); /* discard all remaining shorthand */ } else { key = shorthand; @@ -853,10 +855,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, av_log(ctx, AV_LOG_DEBUG, "Setting '%s' to value '%s'\n", key, value); - av_dict_set(options, key, value, 0); - - av_free(value); - av_free(parsed_key); + av_dict_set(options, key, value, flags); } return 0;