From patchwork Sun Sep 12 10:53:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30190 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3084120iov; Sun, 12 Sep 2021 03:54:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwsQBhYxSR5YdfEp4vnHwm0XOpsv8kNP2Ne/GNPg3IM6kqlxmDMd6883FFE89zRJKNBsa++ X-Received: by 2002:a17:907:9854:: with SMTP id jj20mr7198146ejc.133.1631444052095; Sun, 12 Sep 2021 03:54: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 ne17si4830752ejc.518.2021.09.12.03.54.11; Sun, 12 Sep 2021 03:54: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=JLKYWQfJ; 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 78D5468A880; Sun, 12 Sep 2021 13:53:58 +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 423FC68A874 for ; Sun, 12 Sep 2021 13:53:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MPWBb0ZvdYgJd8Sjq7I41nIhh8jcmezCH1tO6HLLsI45ZYMleymEvdp3C2iSpRy9z0oACtPhnlnutc57T7xOaqHjdDoNj7TDQ2ixgDdzWhDoY+KT0x6KwnoyiaMbnYnCvc6gxnsPLLm0lO29exF/PVuvHXY6AtimgC3PjPFbeL89Q88qDy6BK2zdZJeO/1eciP9Mvpyht0VkUcPY8YkKDB/ryzSAkXD7fZVzK7WtEpqQvFv/wDJgPgQC8gKeUI7sUB8Z3oJ1Ug8/ug3tnNjYeMhm2/ZgtXDi95k2wAvuwTOKKIhD+XxoMsW3QrZ0EjpVDgF64SX0UhASBfz1ILZEHA== 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=a5XCAoJ8W8d9O9kT4WSKdkpek+ST5FglRMZVd2PMRAg=; b=aHvzuW3AXJ6Uom9IcqE+7qibgN4vinvFmgKqVcu2idGOT1ymsHe4kmBQyauOLYU5J0nU6nIotx70aZZh8l9e34jpvMN3mbWa979Hs7kQjy1qIDToLNuLG2IRVNnzAPO6kyCW9K4jGWuWchtH51N5K/5EDYbzHnHRGRsKHDgGKQb71jGP+XECUoWLhBkOFeGAMOhwxcTaak2fO+LvgPzbOAGr3sG19IuDaQOUDVI9IzaFruJIOi1lzoIM10eTdtdmnezfBkLfvo/Y9o9aPKElOZYFTqpnPpi6Pcs+TXryF4s77nzCdak5AycUGG0d5uQ+16DtxFE0wafaNM7HYjPGdQ== 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=a5XCAoJ8W8d9O9kT4WSKdkpek+ST5FglRMZVd2PMRAg=; b=JLKYWQfJEzDq8ggnju97MDSDk7Eh3PszNSuscplAjFA7I0tnVyDI+EVnEVwN6SI6+LXwoSq3Qk7jkZlNS0Hq4saLj8MnLwoIhKPH6cklnzd4u7WuiGqYu7efYKzRvVpfkroRt0s2w2kIzsrZNxjZLXIhmcRTrMEPvl+j2mdN7DTuQuiB9tNMAesm58FcgBefFUkFCtDPHwTmUJx7APqMrUTE1Oec2Xuyi0EHCxmpZ/SHElDbDnshS/tjias8/uQzYj83chHFZeklaeE4eiuBcYhRggaOap1H7o7RKdeAu9emx/PsE5gbfXO575AtAPPU28Zd1Ebqw7uLEwYooHWqNg== 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:50 +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:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 12:53:21 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [rUKtLZZBqIrqZrkQbnJpAQNXUwd97hyc] 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-2-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:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b53b48dd-04b7-45e2-cd87-08d975db9a4f X-MS-Exchange-SLBlob-MailProps: ERoE7pfUhoZGVchj8I9Akwve2PC2v2qPqZXcyd15gt0+I2PuTHGd9HdG7FKnz/whlmr841mGFpf8j6ejC+Z+nD/VoPmM2IFDHzHCTJuRbWIvKj9Ce/LINvwmMa+8gP+2XRUKG5YLCA2ZxlYaaIxHbfgAFEIuZuONY+jJsNDGqGamM0ZLvVG3In4TvNkfF9uoVy5qMNy1QPJ+6QWJVm7ULtXS+JqkbJDLlmUOGbQj1wgxf+e7g93bvgPB1V6S3Z/DCBW34CV/lO0GuEl8eIPf7U28lWd+iu/2GF2zUTpqXlVtW2Z3+FXQaaBoQ+N8IVdJFUzRapko6buJOJKejZefImQqkVMtP/OwtyEiTbARgWxQIMXk5z4G06w102hGDBsyBCaGk8FKSiXcUhsCFAfaw7Dk6UkM8veYuAol6DukAOmyAC7ETHwwDW+Pf2JbFvGT4C8b4s308QuACqHSXJRNi7ymOypUgjku8yCk6iBPeODvnJ1YoOi5vaAqVWUFaqzsQI+pp8eJMB4+lF+Uk7i/Ll82pYTRJhDdrxKRSpLuumzSb5uJbHLKfLVGzZsd3vXoE4gEtRxAUeP2sEDWhVozU9YziCsLEcFSDL+zJPu2w1Jq8Y3OEVZ33a+0/NsbM6PaWgfSu8TX2Zt/Cmaw8vEzTof1e+aYWHZNQwuRZ4WJIr00gy7ieZblCg== X-MS-TrafficTypeDiagnostic: AS8PR03MB7158: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x94m6aWCCF8BOs2NBerJdnyId3Fj1qjI9Ng13YywVxpbCehsrJe0c92QZILoXO1fiiskAFkojtHLs93cIQEaJIAPbtaLkG4BWK0BfTcdIOY+29Wnu1AaVVq8QNwmOMBCskrFuvHSgJms7rm18ykabUsRWVsXsn+sG4tyh5Zajz0iwTdqSHHUDuEiQQ8u70KT7MlzurDkyUX2Q/YupTkk4aKRibKBWR1z5N+WQfc79xrzm0qLN1+y0OiINbkwskmSDH9irP6fwCf+3TN/XgEaw9YWEYxKKp15sWo3ux+2Qml/lsPfZU7ooz+l3VvnxPe0jHHG3gF9aHfS27mFV7DlvqREYKwy9WZIlCgNH+t/WPV28rVSwhKCLMBrlZAD/y8rNHAUPQ3SaaD4EaDH1mS9GGJURvR1qF5u4BmoGCuMExo0A/LQUjjds2U0OG2ABz0Y X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WTtN4by1KkvYPt1cwdO5M1DK2oIM7hzR7dM9q3zh6knq51opeBgr22lIuMkqhpBMOM/zrbMMLDBetykVLYlaeYn6zljINe/44hxU9rZsRfVVSDKECJtAlLkV5yK5NC7YrN988znYkrFGswx+9Im3Dw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b53b48dd-04b7-45e2-cd87-08d975db9a4f 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:49.9144 (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 23/38] avfilter/avfilter: Remove redundant parsing code 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: pWmVr+x1X4ns avfilter_init_str() (via process_options()) both applies options extracted from the given string directly to the relevant (private) context as well as to an AVDictionary that is later given to avfilter_init_dict() which applies these options again. This is unnecessary, so leave applying the options to avfilter_init_dict(); this also has the advantage that all unrecognized options are reported before erroring out in case there are unrecognized options, whereas the current code stops after the first such option. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index c614eb0740..11d4e01807 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -853,25 +853,7 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, av_log(ctx, AV_LOG_DEBUG, "Setting '%s' to value '%s'\n", key, value); - if (av_opt_find(ctx, key, NULL, 0, 0)) { - ret = av_opt_set(ctx, key, value, 0); - if (ret < 0) { - av_free(value); - av_free(parsed_key); - return ret; - } - } else { av_dict_set(options, key, value, 0); - if ((ret = av_opt_set(ctx->priv, key, value, AV_OPT_SEARCH_CHILDREN)) < 0) { - if (!av_opt_find(ctx->priv, key, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)) { - if (ret == AVERROR_OPTION_NOT_FOUND) - av_log(ctx, AV_LOG_ERROR, "Option '%s' not found\n", key); - av_free(value); - av_free(parsed_key); - return ret; - } - } - } av_free(value); av_free(parsed_key);