From patchwork Mon Sep 13 23:23:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30233 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4467010iov; Mon, 13 Sep 2021 16:25:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4A/BBIf59abt+xqocR9MyxI4xjXUXgHH0dC9Mh/6FhTejaJkLRqzqGOG3tS2PC9U0pUCt X-Received: by 2002:a05:6402:358c:: with SMTP id y12mr7543604edc.50.1631575518195; Mon, 13 Sep 2021 16:25:18 -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 c11si10747868edy.201.2021.09.13.16.25.17; Mon, 13 Sep 2021 16:25:18 -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=duVBARVm; 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 7480968AEF8; Tue, 14 Sep 2021 02:24:34 +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-oln040092071105.outbound.protection.outlook.com [40.92.71.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1266268A903 for ; Tue, 14 Sep 2021 02:24:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GTaG/LOaviPUlg+cgm2rloS0gSoCjajgruVQM3dsz2a1ysGPaV99KvXvoVXPwC/WDM6xSKR933miuL5nIkF1dopRBGHomPjbnDIt2X8zavvhZtAEjXzvknUqKW63XN6h7otc1q7K/MB7WJ00EOIv1mJCa5km2aQvu6HoZ3sFEcxHwXtfgiGPA2FDXh8z88A4p/DThxd6VjIhS+RqCtrdkQ3F2Zvk+jfvSpjGjWw7UkHu+49xtSnvytXbf6eKRbbuaMzKaFW2zflKOBXXuE9nO90UsGQ+LnpAnhtd5v1E0lNDIc3mFQaTaZ5z8yVlsyr59NJP8DVCnFwWnUYTM2icyQ== 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=8QYJ+roRQYuKPeEyUyL28v/OvM7CKq87cWb0/bjNbSk=; b=I36ad5tQd86L43KE1Z9BfCy8Wb7IfTyzsll2N+7tpg7pIH8/yp/jWyWYy+bkfpR7g9Q+LEX4WuKV6/6QHl4QLfIKFbF5QnHSGGg82WKiLhbF2Mk4GLxhrKAziH9CMDMign25v5V1qRlogXEAcgER9wwewaUX6PALJMzdHYpqUwhotAPM40u1C3+xSfDimtHgZ+kcl2wdvbU+4zmkeSwVMxd5lfqXV0gTtqsQauVLnE/iPJ3WuMh39+gt8VAuSME8jwaldBwIqaD7JUrMGIJxtVAMFu9q65we0Ztn4euKb65+UUw+I5UVjRk3xOYXKBsG/TK+bKehzCkdQHD97YGJgQ== 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=8QYJ+roRQYuKPeEyUyL28v/OvM7CKq87cWb0/bjNbSk=; b=duVBARVmQknsEzUKF1o9cbot3Q6M5l6feNw0aQ2LFh8Uci05jTjFSQYMK88EhStkcLmGAeU4Tt62bcs5y+dBJTnCNaznLZXBDIEVlOH69D9eblAUuXMjYuCib2kH+X6/4SAeFZ7rypz6BdrCTvfvBA8Rweg9aA4WCfhQN8yDNvujW2TZdAyF7hPLYsQeBFxnw0FL/b4/lOnmzq6FF1fLemTzRihZc1c4mMLge89DjEz5aePGnydPsG7dS4i2Hsy/v/uscdzqOye00ilIes3rELL7CS/JLsRgs2JqbEC7bluXXCuGoXeQBaoUjPJxVzDqkcM8DagZQNAVx8CaFsIquQ== 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:30 +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:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 01:23:35 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [0LLM3aT66M2z5+Fhqypbu9JqLcUS0LYM] 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-9-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:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fcdc276f-26e6-4683-ca2f-08d9770da309 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJ0H+K4Wek5UQBrLJju5Y35rJiF2NrBa7nan5oBSNPQLTL7Ei5lVdL9YJH4cmVDPYfldDO44pplfWKJvUUnoR8i9mo2hlMtJ5wghlUuM/QjzfyTYKn3lTs58ZZOWohkloMQ7Hzedk35HFniLLD8yUprO1cAoq6ldefToAvRm7IPxJOVssqokzLatTlKdiZ4AM9ki2+WM2Al9UnN8694RHYnuY7FBhsuVuhgTuMUiLW29mjX/elDfqqKNsenxuoudPlFy2NIVzLac03G+fB6x7t9bmtnn6fjYNfMKHzBLp257F2Xsj8+KGrpFJwn10orMy+ttQ3ug7ah0fBKDsVD1JoqDMgS/e+hZK/fqI9Kf3u3YRRXCydSPMSMGnerERXyWOguLGKqVLQBK9F1CENeKXPGItiEHLtn2Kiv95wlizMMEwv9imETELliT1/EoiqLQ5FSV5ieAUSNyEi63itRLK/wKvX7x2mnE8mTy7FLGTWHEnkeAc/vBGpVmG8F+euBbZLFLbb1lpA5d+yxQDuZeJe8pRFwXBfeqLBnGxXLKJf0INS1QtRrohLvineFdT2qxXUgvCBi5jhpaBky7gmafqWLofjP5ozZqzimfF6j2TWO5QwHG6AhhbrycFY2G51irgZ9Tdso+eTwMR8GbyCKdHUrtlN0AgYDG+2oA98lFMRqFE0uUC/bo0hqmZ2bOCZ4bLOZCw4iyal3FA== X-MS-TrafficTypeDiagnostic: AM6PR03MB4216: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mGaf0s5Mbp9KrVgah/qaIJGMTj14RCxSrf9w7dNY+TqbkAmuXcXk8W7qtVuKss4+ilPG9Fh7vIksWIc1HqkCwIzmqPR0NzCLp2mNGdyU520qpFr9sF/hUxabyR5U8KS1RlwJ1OpcMSjbktR2G8GiSRlktH5D1TQrFTvm3t/SI3J8as7IxM4yCGPU/ocFQFbx9EtO7K+zzx+/hSk/9aqom7iQfTLYEDge47e1PRAv4qTkfwGDtgt7QRFzt0evw1uR3PNqvlhEI3lZFfBrMnWS0fePesP1+xVJTQQwyyG8ZHUcN2nJxounfnGuZ6C2pwzS2J2RpYjONnRh9igumB/vnmarTftL5aQKH2nJZXNBoO3aDXe5S21jsz+IhVO8+ckUQ2Zo4vjZk8fkjXWiqsaUzLc/aWgb//PclTTwjsjy4UnHgzTmTCtl9GNh63yAwjfX X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ndBMy297JOnzkSUEl20W92LV8sS7qSvl+j6bii0aDFOgRNeGCyr1fRL7ThfU3khEDzJsHUJp1mxJh2dPPvUjeEzoWwAJ7Phe48Q/3+E77/b3dUJ1Wy0YH1yaYnozEFb1yG2S4qEcndBI3Pfn6hkiiw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fcdc276f-26e6-4683-ca2f-08d9770da309 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:30.5374 (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 10/14] 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: kCXlEUDboBjj 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 it will be possible to report all unrecognized options before erroring out in case of unrecognized options, whereas the current code automatically stops after the first such option. Signed-off-by: Andreas Rheinhardt --- The reason I am resending this is that most filters using init_dict ignored its requirements; without the preceding patches fixing them the scaling filters init function would succeed, but one would get an error message lateron in case of unrecognized options. 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);