From patchwork Sun Sep 12 10:53:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30189 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3084183iov; Sun, 12 Sep 2021 03:54:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwfgI9ZCBUC1HvzfxyichZ71PYnD4FqDtrHWPOItmmQI3e5pja/+z7ZDww+veByM6FHu99 X-Received: by 2002:a17:906:68c2:: with SMTP id y2mr6914275ejr.18.1631444061773; Sun, 12 Sep 2021 03:54:21 -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 eb13si5207870edb.3.2021.09.12.03.54.21; Sun, 12 Sep 2021 03:54:21 -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="ayMDV/GM"; 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 894DC68A8E4; Sun, 12 Sep 2021 13:54:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2066.outbound.protection.outlook.com [40.92.91.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5851168A88B for ; Sun, 12 Sep 2021 13:53:56 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hOUEQnQXgwtYeyibeeBwYJ0dphottxSOA8lWTQndLRrVX3bJsHlj8mkTH3ZQQqc5ffJRtiEPLq3I7NPrXXKpMavhQfg7jeNOdTWAFwSmuRvrDVLFm8AQ7XjKByW8INOazGI7nNrZlQ4RW1VGm4ZO6I0XNT/RyfIJ4qfnlP0PimTNISd6ePIevMhMihkAYLCmWVL3spKmeICNdD8L521utjXdOIwf3eKOazrPpDjhQrPueDVWcjpw+M9h0eJGl0KE1bPeI/PXNx3Tg28QSvsq6hbpTMJ/97n1sw2p/QTZAAwcZI5p9N1OP0xH4sHAphN6aopU7YO+n+DtTC+ndMSlPw== 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=oFOWs0MIRdsJmIT2JF8EG2PDCG0Ulzmrgwzg7pGu49hCy5Mq7BhWapvrXZ7wxFpzoniMsqBzRWM+udNjMiBUlrf0UI4x0Q0WLt60VNAS+yX/xwimW5idXHMkFKV8iu8BlcPAKYtgomIiTdgQW73sPfeGrExGrynSC1uTxYZNB93e2B1aPidHf0uuTP7slqmCCSYZ9/CoLJz6qMMXP8HscCjjgO7aRfxv4Wa9qzuyHdjWYzmQu9Gf9h7h+zgzct+XrpM0vpd7ZG9cLaMiahWE4QBZubTh5XPqfLt9KaYbDoeuRI7IZ/zlHJ34wBneBmGcSqBDiqgF9SuutiS/4CG9wg== 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=ayMDV/GMAb1AY1GmD9v9vmDjraJVs5zgxDJNWrONgRtc1TZMjBmx9to5pkymunRu43i1vbyvibspYfMWXdLM/AB26YlJEYZoBZa76idarZRXbpyWMn7xHS1Gw+vDC8R4PCAO9LAdzzcuNlzmxRnecRdl0PGge00GaqFgkvlDdOSbCwRnP0Dmy1QqI0qJoDUNRybnQEarPBOsOkzlI9Nzfr/0e7hfs/O1o8sRXmmHnYf3WPtGG5l/4uN8BWslqeKlzZIciE7cqh8k+Gllqd/NGjRq9AAxzNc4z2fhav/BEudSvlw99UskrUXkXxiF8o+DP5xl3vUVvVBWSpX80hSAGw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7158.eurprd03.prod.outlook.com (2603:10a6:20b:2e9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sun, 12 Sep 2021 10:53:52 +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.018; Sun, 12 Sep 2021 10:53:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 12:53:22 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [M/luY3E/9w7TZbkuds/9qwRSKUGl4t/3] X-ClientProxiedBy: PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210912105330.2310204-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P191CA0049.EURP191.PROD.OUTLOOK.COM (2603:10a6:102:55::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.15 via Frontend Transport; Sun, 12 Sep 2021 10:53:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0be93fd9-a255-4825-cdb2-08d975db9bda X-MS-Exchange-SLBlob-MailProps: IONHXCiRWANgiGNl30/Xz88Br5ZgdUZI0DtLyvYyj70MAG2o2zhpqIu3PwTAqB9pMWd/VFGi8cA3BUs41G4IxUThDNeTdTHDsPBjXNvMJ0OKfgcFW4Jm+8hY/ZcJgh7Hk8XlTRMYssWXkwi4AHIXeEA6HVhJu98QZ50czbdDLrKJD05T11VGJNXMrnFt8Eo9ALrTbr2xERNMtkk4LA1JU60KdfJgPJv3h1mVnchkvyA9ms/HL4AuHVFtNcOgOJHEE1i8EgUzOlIWmWbG83Gw5p8kOepD6b8hwfo92zywNapWbexQ7i5M0u4aCiumeKKlmt+lc7aO3iZdcfuj/rdnpH5ljVFJbWvc4Opy1l0qrW6mxdMLleyfxDm50qaum7zRsEBuGOZln4jAf1gM3XZAJhb797B9X0ljMXcgCUPQ86Z3wpDaW350I8VW8S1Ci4+2/Qsc6baEz2rFAbbIHEPldlL7T9C5UTbuzWae5hf2ypayLKEB3PFrpFVqQPkn8oq9CxAmcDGz3cSN2HH1tk8T1mYvA/lPyVH2axmF7gcRmdyzLe3ebocGxIrUwDVmlds/jlWsF7gexJWsN+tyidzcrL1PJGmVQ5LWFOOvCdwbsTKH1FTSb5Aq4Tfig+0AcTk7PASsOJbgLA8ua9ILiWgKVfEFGU4+ajPLY+8zvWytfhjgCvQz5ngNKfwSigfh12eOHNqX2JZZGbtmVe6Vl22c7NLDcLC2dVmWYI46H4eTCvY= X-MS-TrafficTypeDiagnostic: AS8PR03MB7158: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W1sxiwKvKCosvfMHFn1U2hX/CiLjph0Hk/dnE5I/lMoYmv7ryhniQyvlVKisp4xKHs6/jYxq3uRZszhEENlFDoArV9CSkr6XR29cKHzOp5DeMiY4t1M9atk3yXUdLVbbEsKONpQwdNfSoFo+zn301l8n46SLR0gMR94kaeFsqMnbeMHN20RrOK/9YGAZnO7w3sJBwB0TsODl9p/9aB5wWGo7oVeh5JJZLzNfLyDEdFoAPptMb2GLBcVDXfDJow/ima0+FbI64N2WG8Glg7gpq5Bxk174BocAn/9NujcqhmLU5D1v5bMgCFcJSXZ7Fa0lvexLJ9LN1GNeAJZ71lXVjR+WjjGs+gI71SbBmOJHW0kKhmXUCzy0SLqy+KWXzaBigrArJEFZeErrj6QuSwo/fLlERJvoBc1wzUYu+iQUWGiRohyoAlSyx0uEjmQ6nAK5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mJZcAfWwAqqbTRKBpi5OZIJ0FDY7yt703uDuJhahEpocENDYIBlu/gnGdEdwydAV74AYo3NcCswk/JQ40/qCMOl3rIjOpM7ZEI7FPc3IfjIO8wnUJY0Omz8d/ZWnfanG/ao6ucHcKViun/IFKRR5Eg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0be93fd9-a255-4825-cdb2-08d975db9bda X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2021 10:53:52.4742 (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: AS8PR03MB7158 Subject: [FFmpeg-devel] [PATCH 24/38] 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: 3OlIEP/Y8PRE 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;