From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9220E4374B for ; Fri, 25 Nov 2022 12:50:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CE6DC68BBD0; Fri, 25 Nov 2022 14:50:34 +0200 (EET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075059.outbound.protection.outlook.com [40.92.75.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D670268BAEE for ; Fri, 25 Nov 2022 14:50:28 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FxF6DXrI+9Z4Pd97UOuISw1LH0AStRyk2719270Mb/yDUWjY+iEsc6q8k5be11SUs8OW6ZNstJhb/o+9Mkwr+XLqLmOlCI1JoJLwKn3XrxhUlCSR74/SPBCrbOcDLLCpqB7QLZ3LjDbJ5OkM9Uf1lXnmLsTvs6uGdZzKKMvQ/k5e6+igkNqHLljaG1raJODEA8FfZ/odGn0niAFKh/hQ61446XPqyNx0Aw+QtNq5y88zmg5D35+s+1ePJgfTd7cok8ePah4w0VpUrPgrchQT7ZgTX4vcJ3ZhwGZxOf1VW8N3TczNwttlW6fqVE2b0M3T8QakA3YieW28hjL3W8yt7A== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=P98dF8SnxS1VAS3abEzrHzeObaDemVNQRZR3crDqZGs=; b=fY5LbIK5YH4JTILXLQiDnHAqrOKWEWw91riQcn9cn6+oU4j8enVsPlENxBjX2EHAEydvyJSL44uA9o2VIwUZLy/xbi84rQfb5QGSIiO8ShTOf1ho2maNjj4+mbdnuzZUUK2Y3wmcoaING0NXsCtHtuq0PafiQLA/3rh35N/g6kZtambwxHsTHlCrTvi2YXUooKUepyJ4bJRnBpudexdXiT6roIoYJvLcQFmOIoec+y7AT/nXtJ5qJ8Yyg5+3cZmZgg5SRXUiPDg3mzxeI91Iddox73irVF/VyEMUXGUMT13zzzXwFxXoXrMJkFbFS8TZ+Indi+05kipLE/0XTL8Zpw== 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=P98dF8SnxS1VAS3abEzrHzeObaDemVNQRZR3crDqZGs=; b=hnvGKuf10AfxqfPbT4uSTsycD4NeFlHvWblZFSfCi2Ln9TIBREEZNG2aJ/v/IHm8VrGW5YrAQD8DJMkcwFDa2FhS/GtHcs1ups9O+v5mnkXpz3PLXtjo+n03SDmGcSPoxewQOOcbUyhP9rcZsdWTD+4gtdpERvMDM2NX7/dw+4rbxFBe+ZBJMkOe1ju71u5pt2w+0DqtRZxnm4Rfal2yDhOA58MEg/mz4m27X0D5rOK/FjdG/cNA2c48hDhjkZ4zesQsCJs4wMOBWKShBLLoTYikta/7LgiQml0kjSa/FeCjVUvSVWbpRfowynOAkLGNfyIhkmrODLJVkK5Kb0Duow== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0274.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.20; Fri, 25 Nov 2022 12:50:26 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::c37:cabe:316a:60b2]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::c37:cabe:316a:60b2%4]) with mapi id 15.20.5834.015; Fri, 25 Nov 2022 12:50:26 +0000 Message-ID: Date: Fri, 25 Nov 2022 13:50:45 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20221125013046.40904-1-epirat07@gmail.com> <20221125013046.40904-8-epirat07@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20221125013046.40904-8-epirat07@gmail.com> X-TMN: [oFA/fH2vFnLb0hgI9HNevja/2WJNoCbd8da55TqumIE=] X-ClientProxiedBy: FR3P281CA0169.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a0::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <9fedc51e-4447-ec8b-1e74-c13d4e75923a@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0274:EE_ X-MS-Office365-Filtering-Correlation-Id: 62318767-e39f-40ca-4be0-08dacee39fab X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hKuXp9xe3d3c3n0FeolzRXVQcKZAZfvJf/iaWnQPxdoOYrM3XgKNbV3h2l176BEwyPr4VnH/HkvrrBMZyropn7WCeHRtV2yUrNfm0b5TlcSZ02bp8nEkoNUH0xgX1yGd1MR00W9jqasrYGUSggttAb2uz3loGU1hNRH9Z7fk5FP4DbCGF0Mq++wgpGih4gtKW9FTcxInEe5fDkhIZWnFF5AI1ra3ZCmjELLe/vzsHdymD8TaNek+Yrve90GMvy3/yuR8nb9n1/VSfdMenCMNTt7aGtNCpSTuvhzgClGX02WP1rNn3Tv9e9FSue9XGxlQZicyW9TJd9d4zbhC/s3eqv6sTSGYN8eFqeGYNFYSXdOSGcS6JoiLt0wzQSsN+EDhPbNs1HWhg7vMG6G0mHvxb8cnvf5+TsnCq9EcsVOrdait9aEWyiwharWSlBqhUZa+fK0HyIEx9AekTmUj23rSC4pIqWiQMznoUoaU+L7FvW4pjYbeQeCeYPjDdJhkgo9t+pwYy2ZHS3iZVgSGZz1hEL+6e7y++IXOBXdmFhHEcU5MSSWOJYpdC0GMT/9AK+9A7Nvoku5fnTg5p3CTbQ+NtpUZhLfH1jkV/EfxJ5XeeMZ5KIXt7TNqn3/FHW9+2ISrb874USxtSc6RnOzI97npHKVzJg6U07M06SxBonwMYN4= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TE92aUlIbHcrdWxEMnB2dlJzZVNHNTA2NlNaU1hhL1lER1BSNGVVTE4yblE4?= =?utf-8?B?cTlZYTgzWFZKZjhKMWRHU0x0V0k3MEN5YzN1UEtxNUlaTENCdHArTUJnaElj?= =?utf-8?B?dUtyTnIxN3BoWHR3WHZHWlRBSEI5N2FpVlNTNUVRR3RxYTEreXdkMzRSZEUr?= =?utf-8?B?d2N4TDc1MmNxeWIxd2NDc0VYazB1MWVwZ2MvWkFldXR5UFlzcFI4Y3ZIcy9o?= =?utf-8?B?RS9UV2N0QUt4OHdoUkMwWDJILzNhRis5M3VqdXZDT0pzYktzRDJaSkduU1Bo?= =?utf-8?B?cTZEcjNmT29pcFpIRitrTjE4cWQ3bFZPS20xRUlyVmZaazhEUVdNbGFsajdx?= =?utf-8?B?R1JQOFFOdmxaREFrSW03T1Y2UjhHeHY0Z3JCeVRGR0dLK3pWNXE1WnFjZGVY?= =?utf-8?B?YmUrcjNRYkZFeFF6RThmVjkyQTFLVGtKanNDbWJPUVhOdndwa0h4VzE2V3pH?= =?utf-8?B?QmNNZzJDdjRjNmhRa1RYb0VpVnM2M1R3T1BlZ2pZZGU0alBPWjdCaW5kYldq?= =?utf-8?B?Tmp4Q2pmcWx1T2QvejhXaUJmMGt1dlM3MUZWZW5hckVlOFJHa3NOVGI3QTVi?= =?utf-8?B?WkdRa0t4VGp2SFRsR3JSbm5nWUpvSzBSbnlzWHphbGZjbGpWL2JXcmprSlBV?= =?utf-8?B?NTNJN0FmcnVEbVc0S3lTalBzbmdSNFJhbittQyt4cHRWdnI1MVdyMGllMFlN?= =?utf-8?B?NmFJemUwd2VpQm01dGU1MUg3V2dyRkdoaERPYmRDTXdTQzViL0xlaWVLZ3hQ?= =?utf-8?B?cXNFUit5V3FZK1BPUFdSR3NwUXlPdElPSDhPNDdXMDFtdUtaRHZNWnFOYnJE?= =?utf-8?B?cEtEU2RvWDd5NEE4T1NoQlFVRHR6NEEzZzlTTU1pRXdTSy9GZVJFOHZ0Yitz?= =?utf-8?B?aHI1Vms5dVpxVFI4QlAyMkhlN0twZmh6dUtkTk03c2l0SmhKeWZaVVZJdDl0?= =?utf-8?B?N1VITXJ6VU1LQmtHUllER2lNVElPeEoxNmhBRDdHZTRFYmQwdjA5QVBHUTZO?= =?utf-8?B?ckdqVDdkT1hDVDYyL0VkWCtOUytXMVFOY0VIaXFoQ2hNM21zdzJGN0xiQ2ds?= =?utf-8?B?aDM4UHNDV1ZvTVROUFVJVVhiejFzWDhHbGEzY25XckduZXVHU2h0ck9kVCtS?= =?utf-8?B?eTN3VEpKZEhvSVlRMUdYa0dZS3lqbXhiZ2pEdVE3eGJmejFvRUZSbSt6YmFq?= =?utf-8?B?VVluMGRhL05uQkxsbndqQXVRdmZxK0pZSlhld0V2UDFDY1FVSG4wRy9zNlFU?= =?utf-8?B?clRnaEdDQ0VLSUROQXVZNW9RY3IrZ3N4YUViS0NLbHBEdDRzT0Fib0dGNU5o?= =?utf-8?B?c3NXYWJXbEFtaTREYWs1Y3Z5Z1JmdS9DaHMwK3NJemFyRWd5L3hMZnlSZ1N1?= =?utf-8?B?K25hS2t3cituVkd2aitsWUQxeE82RWtkR0duMUp4enNSSWhPTHpIMEtScC80?= =?utf-8?B?Vm5Hc2xaRjVFMlZRQkg1OFppTzUwSmJrWVFpNHlLODUwbE5VZkovc1FCRGl0?= =?utf-8?B?aEFxWkxad1hLdDR5dHc0QzVxZnRuWGF6MFVicmx0S2VUeGpHa29BTk8wVmg3?= =?utf-8?B?akVYc1JkYnd3MFJoOHhXTzlrRThCeDZjZkMrdnplRFpWVGEyZlVMK1hjN3RD?= =?utf-8?B?aDcrcEMwN0s2YldRMU1oY1dIYjBjV0Voc1NjNGF3VzR2VTIycEgyQ2o0NnpK?= =?utf-8?B?T3FTeFNISjhKNitOY3hTMUxLeHNWRDlVNEFSeFRFN0tCWEtLeTlTVFpEUHFo?= =?utf-8?Q?g8ajPicy9WlubI/bgULd4hawb8y2RPsKh/dJQc6?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 62318767-e39f-40ca-4be0-08dacee39fab X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2022 12:50:26.0078 (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: PR3P250MB0274 Subject: Re: [FFmpeg-devel] [PATCH 07/31] avutil: use av_dict_iterate 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Marvin Scholz: > --- > libavutil/opt.c | 12 ++++++------ > libavutil/tests/dict.c | 10 +++++----- > 2 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/libavutil/opt.c b/libavutil/opt.c > index a3940f47fb..0a909a8b22 100644 > --- a/libavutil/opt.c > +++ b/libavutil/opt.c > @@ -1742,14 +1742,14 @@ void av_opt_free(void *obj) > > int av_opt_set_dict2(void *obj, AVDictionary **options, int search_flags) > { > - AVDictionaryEntry *t = NULL; > + const AVDictionaryEntry *t = NULL; > AVDictionary *tmp = NULL; > int ret; > > if (!options) > return 0; > > - while ((t = av_dict_get(*options, "", t, AV_DICT_IGNORE_SUFFIX))) { > + while ((t = av_dict_iterate(*options, t))) { > ret = av_opt_set(obj, t->key, t->value, search_flags); > if (ret == AVERROR_OPTION_NOT_FOUND) > ret = av_dict_set(&tmp, t->key, t->value, 0); > @@ -2137,16 +2137,16 @@ FF_ENABLE_DEPRECATION_WARNINGS > case AV_OPT_TYPE_DICT: { > AVDictionary *dict1 = NULL; > AVDictionary *dict2 = *(AVDictionary **)dst; > - AVDictionaryEntry *en1 = NULL; > - AVDictionaryEntry *en2 = NULL; > + const AVDictionaryEntry *en1 = NULL; > + const AVDictionaryEntry *en2 = NULL; > ret = av_dict_parse_string(&dict1, o->default_val.str, "=", ":", 0); > if (ret < 0) { > av_dict_free(&dict1); > return ret; > } > do { > - en1 = av_dict_get(dict1, "", en1, AV_DICT_IGNORE_SUFFIX); > - en2 = av_dict_get(dict2, "", en2, AV_DICT_IGNORE_SUFFIX); > + en1 = av_dict_iterate(dict1, en1); > + en2 = av_dict_iterate(dict2, en2); > } while (en1 && en2 && !strcmp(en1->key, en2->key) && !strcmp(en1->value, en2->value)); > av_dict_free(&dict1); > return (!en1 && !en2); > diff --git a/libavutil/tests/dict.c b/libavutil/tests/dict.c > index d053545f4d..8c05752ea7 100644 > --- a/libavutil/tests/dict.c > +++ b/libavutil/tests/dict.c > @@ -22,8 +22,8 @@ > > static void print_dict(const AVDictionary *m) > { > - AVDictionaryEntry *t = NULL; > - while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX))) > + const AVDictionaryEntry *t = NULL; > + while ((t = av_dict_iterate(m, t))) > printf("%s %s ", t->key, t->value); > printf("\n"); > } > @@ -94,7 +94,7 @@ int main(void) > if (av_dict_get(dict, NULL, NULL, 0)) > printf("av_dict_get() does not correctly handle NULL key.\n"); > e = NULL; > - while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) > + while ((e = av_dict_iterate(dict, e))) > printf("%s %s\n", e->key, e->value); > av_dict_free(&dict); > > @@ -106,7 +106,7 @@ int main(void) > printf("av_dict_set does not correctly handle NULL key\n"); > > e = NULL; > - while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) > + while ((e = av_dict_iterate(dict, e))) > printf("'%s' '%s'\n", e->key, e->value); > av_dict_free(&dict); > > @@ -122,7 +122,7 @@ int main(void) > av_dict_set_int(&dict, "12", 1, 0); > av_dict_set_int(&dict, "12", 2, AV_DICT_APPEND); > e = NULL; > - while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) > + while ((e = av_dict_iterate(dict, e))) > printf("%s %s\n", e->key, e->value); > av_dict_free(&dict); > This stops testing the old iterating pattern; instead it should explicitly test that both patterns coincide. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".