From patchwork Mon Sep 13 13:53:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30212 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4021430iov; Mon, 13 Sep 2021 06:54:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy392CNkTbWqOP2YAnvQZhJkNfbLi7UIu8+OwUNV35nOc4hdFOT2F8C8MjJdVEtGmvJVonU X-Received: by 2002:a17:906:57d4:: with SMTP id u20mr5825607ejr.445.1631541288476; Mon, 13 Sep 2021 06:54:48 -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 gx11si2072496ejc.521.2021.09.13.06.54.48; Mon, 13 Sep 2021 06:54:48 -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=Y2o4pmsU; 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 93FF668AE52; Mon, 13 Sep 2021 16:54:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069079.outbound.protection.outlook.com [40.92.69.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E661368ADE9 for ; Mon, 13 Sep 2021 16:54:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E60aoxzRDDRmgKAjeafPV42ZptQMe/8Me9tYx+YUaLHh67ctcPFWB6g0IKuWEEo4dqbxGifYNRKUQ1uVv7LjTCSpDj2A5i1j8CHRNEzTIjIvsm0z+kaD+AEGCB5XPRLcQYov+V9y1H65YyyoSHoh2Cq/XurAbPYlb9CmdCU+p0n8uv7XIzLt9FYWjYkHiGfLxijuYs7pdN1iFizy6FqnsX91RIJprmAD6A+iB/KbSuWt97dMW+Sm7NvAMfI9q2sBh05Oole0YrPGklH87KbuIg8kcUM1+evpyF4DaXm4PRPUqlf15r/DE/l/GQjW/07/k9Mw7BvzioAg+uHZVonciA== 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=gyLz2hAzxu1hMwvJ1u+yCX38RCnHDZY9VMrNXMN5YhI=; b=gmi0Qb+l4pupNWu88QXWwtqa8nXTQhoqXYCb4onYwbFCUUTpFxTjHcRguUXixCMvONFBDs9LmATgD2Z/DI5gHa8uP6H3yZHV1U3XF9ehWvY1fc8cqcyqTBevP8rk1MKyoPeeynrzUtlxyAit+4DGoubUUNF5OewAzC+h41+fhUnvaXGpq7+104FQH3j81WMkqXU+uNGO4FXshHIBYiQBfzr9WxwZd3zyoDBy92DV/+y01GPr4tKKFmj8ibaDoJHTtebKkNyMlFYfRhWipkZEwsnAy+TEwyzIh/kFoUjm//1Ika0MzsFlN/7w8z8V3aRr8VZIPIjsZsg3na5TGB6o+g== 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=gyLz2hAzxu1hMwvJ1u+yCX38RCnHDZY9VMrNXMN5YhI=; b=Y2o4pmsUV0sRTBv0BnAUxZpvqsIpPWi1ATjg9YRpy0FUwvO3UkWyTPmzrXNfRgM6K9MiQZNDW03am8f+yPzlFlJC7Hx5Z3aZT8bhVFmUUXHKydA2y0ES/hO5MWyDyy8LyIUCWct8FwsVNlgRtcsd+Zfb3E7IFBFpsApvsIqQdcJ6AZli3/r2WH6T4YnLMVPC0h/znz5h5gKS0WrCzNAz8vAx4QWfehfZxenrVGHonE6HbPfj8Yu+KI1pyvkZQTP7VokzI6ohTt13s8WcH1xn6+6DCjiRLtVFLuqAZA2gvFLHHbLDU8IgDd7Cp/SBVJgAPzGtsknZZmsCslCM7ie+mg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6627.eurprd03.prod.outlook.com (2603:10a6:20b:1be::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Mon, 13 Sep 2021 13:54:02 +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; Mon, 13 Sep 2021 13:54:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Sep 2021 15:53:33 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [UzEsWaTIOVrBnBnh9Yue5GZ/xTeDYi+q] X-ClientProxiedBy: AM4PR07CA0023.eurprd07.prod.outlook.com (2603:10a6:205:1::36) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913135336.2804405-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR07CA0023.eurprd07.prod.outlook.com (2603:10a6:205:1::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.8 via Frontend Transport; Mon, 13 Sep 2021 13:54:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5d184b72-71ae-4209-a86c-08d976bdf1b6 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXSr2fKdz7sYpLFthH+NsypPAI3RoazAC6DlKkRlr6Ynmbs5EJPMUFDHNtnWi/3Hwn+1ba/Mc20gY9+zPcTsnFQK3A5+ke1VfgPGdMhmP9qBluJz/nKrbM2o/SBv5rN9qwdXjojpSZKSo11AschkMjZgcXaQQkcMIr6IK69gx9BJJHdJvmDV+gjtjuOMRnkpMm6LAaxKgJsmX036PwkYPyphsOIoCbJNQHYkSP05dEMAD45m3FKoNQ2Ra2+rfJzszE+YjdvX6DyRm3q/4bm0Lrf7KgsXbNdXQ8Ay7R3aeemC6I9nWhjLUZeYq1zRKwtPrj5EiV2aDeqsmGuRMNcWUkiAfob7kjCA+7SI85UIYKPqDOicxzsb8bGx+bLfEthPzctvDPgL+udPFuCh6oBcLcJL0u+8eWB7mIKgYlUN5BbZGuUyfKk13FhrtgewBy9rQNog7spzKcen8+sosrVTTjQyuar9BSzvZhZ4/c4aZjb5iMv6H69LroKUCY/2bv/ANx1ELERT3msk4E0G+jsUJZogSfedEMkShschB4RwkDSXw54GdQV+V5GcXaBcDdPHUZLMJS9rYmja6IrkbQw7uMqlTdm/2tLY36jlfB2xe1ORScmVK/tmx+dl34xoCPPwZsnhNs1oZ4LwkAevDS9IrPz8BGSY690PFEw2IyE9T1BqYMAGFtdnD3XCEUTlUe95ZYCcwvATv3F3eYQrmYOoocBr07ni55qngc= X-MS-TrafficTypeDiagnostic: AM7PR03MB6627: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aEhixnAlygTgyCI/fkSDvzwRlmGSbp4JDD2b8ZrOE2d5zQXA2rcJn7720luAhF47KpdB0Q/txVsPR98Sp0oBXYcMxP41eUfWjKJgEvDNf+9qHFl5KBFi6/ItkEaq4hW5VMHTNIROYf027+zmi0Y3sMeIGPUTIDz/stmm0cOzdHTVmVXaId1SjX68FjSjPMDflg+PAE9sOdfj7RhqQMSuEFzJdq2g2236pSGbIhGg4QgY8UI60GKe2yme2USDNiqTkzcnoNSkirTVD+wIA+wK5HEnM1OsCMb5+DXqycfNEkiyfyZyCWqveY7pBx0pLXkhMTpFpFWXkO2ojzy11KHlSjnbXmWIZ4SW4UABY89YDV/Dv0xT8t9QC3s/R3iAlxHXsL5a2INJqEpOiNpdz0N8TQjzbKf/9yxOmbYUTojuCcV+qzX8TYdiHUm+ciQeUItp X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AIVdOh/lWAxs3XITKJElUncjNjWPMMc/mCP9WfKCmx9can/EOQxwtKwD71tcTTWJahs96Bc9VPdbqbBY6TT7LyxmkVHjSbh21EyVucM3dpR37X4V/71jD9ArzlAq/m6ec7uYbtnuSn5TTqbuMR53Iw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d184b72-71ae-4209-a86c-08d976bdf1b6 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 13:54:02.8241 (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: AM7PR03MB6627 Subject: [FFmpeg-devel] [PATCH 07/10] avutil/opt: Simplify av_opt_set_dict2() 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: ZKXdkRkOmWzW Make it clearer that the ordinary exit always returns 0. Signed-off-by: Andreas Rheinhardt --- libavutil/opt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 24b8899ca0..f05283d610 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1635,7 +1635,7 @@ int av_opt_set_dict2(void *obj, AVDictionary **options, int search_flags) { AVDictionaryEntry *t = NULL; AVDictionary *tmp = NULL; - int ret = 0; + int ret; if (!options) return 0; @@ -1649,11 +1649,10 @@ int av_opt_set_dict2(void *obj, AVDictionary **options, int search_flags) av_dict_free(&tmp); return ret; } - ret = 0; } av_dict_free(options); *options = tmp; - return ret; + return 0; } int av_opt_set_dict(void *obj, AVDictionary **options)