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 1B0FA447B7 for ; Fri, 25 Nov 2022 12:52:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3870E68BBD4; Fri, 25 Nov 2022 14:52:51 +0200 (EET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075031.outbound.protection.outlook.com [40.92.75.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72E1568A55A for ; Fri, 25 Nov 2022 14:52:44 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ww0XXzFByzbGTURcmdmjmPUYxCLPmZuW74FjyJhi4DsWF/pw8+VhPcjWvp13l7eyc4gQdaxillJWtJBJQIl4lpWRaxU1KKck5U7UctY6T1rFpA9z5ldVj+zKjG9dgVBdH+DUTAB61mxT/JCGaXdvjvGd+YQucwO3VEYmBtZgVa3R1fhvdUKiKoJ2p1WKXBHfO4tG80J4gk3Qz3AACtRso2OgsOt04hOfcwCFceLtknmD5j1BfT+u3RdTEd7GjBJq4n6U2pW8fbaSA55xTsnAfU4s3/xhRo/V1BjclpBD2dKXoICF51Iuq83ExOOgrxP6Ft90QOnOtsfL6gWFUdep9w== 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=vjuoBxlbMBRciooOt7AQLoUhizncOQmcJpwrCou0Rck=; b=QvADL5EzhyMmdgsB5iE6Au35Kwmc8cnRCO9kQt1/yq5KlIX7QwV6Os+VQRfQ5p3oZ+YBlvQeLxrS9Yv7EVq9ngSeG4Xh5HDcDUqhyJOxhUIY0mM89gAOKzdGcWDR7qCU/D5Q4IjVtN2ZriIuSIie9FixzogFOOzHul/YSFbcZfUmhx2F5R4sIGnfKY62EyttanjKnHEI6xaKYG7ihH+qp6hSIDVUe5L8VoEmHmf45wtZsDpTtDW5pqjdb5S4Eckdm+cgWJoT7rCJj5vucWzSPGkHKsXQTtjoJiOjCfEm7YvlNgiQrUpy1heffI0mxs2MYQjznlFJVSDceYoE0B+T5g== 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=vjuoBxlbMBRciooOt7AQLoUhizncOQmcJpwrCou0Rck=; b=oGw5s0SB+6ddUZjtI+RkI4wnFNarsY2FWp4X7NXqu/vGR5OPNfoQRXzzRgheOWVDqpsf5+jXuiOYFQP61JlB2MAaKV7gtAB/oqVaJaVGisAfg7J78MEFP2p5Z/R3kAAkBxFUHZGDPaE8BgVaZKsPbsOPi32HmGgzesF1uLJ9QMjvlKmBUT8tHndsZl6JQk2bXmelTGwEfveGo/4NmajQQiKDAPbEX9WT8wcwakDcx8bLzsoE8QtrgrhPuT9YJEU4zrOYOpcq3ph8Y05rv2dYuq/4KeKRkhOLSYA+Yuq/goXWfdKSY3PhuaQrdLKkhahHxprHnPMLHJByUtUUHcVHqw== 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:52:42 +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:52:42 +0000 Message-ID: Date: Fri, 25 Nov 2022 13:53:01 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20221125013046.40904-1-epirat07@gmail.com> <20221125013046.40904-24-epirat07@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20221125013046.40904-24-epirat07@gmail.com> X-TMN: [7oO2j0oDlf4hsSKQ1ci+yo8pyjcsxXqqxSlDTj8Gy7Y=] X-ClientProxiedBy: FR3P281CA0113.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a3::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <2d670425-b2f2-01ca-9fe8-2b216bb37564@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: 5b3b3a6e-42f7-4d6c-9099-08dacee3f0fa X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P04Tfxi7h3DYDc/oofD7mz1uwkhqgFaXNw3wRiC6Oq5iRbY0cvDSpjRII8ttRKOE/212mMgJImF/ngRb3U2ya/QreXmd98r9IfRhmwgjWdpIaSyf6VPZ5Mm9EJEHymMBxohJXFD1RyDp68BZty1/UQRXZqLYg4AE1H9C5WEEYJH1fHOGuB0DDf6y0QeFa/9vLLW3wNUxZCeZDWerfGfXRINa0KvnK46q7jCNDIfLb2OriAKCJvypdHnUODpR39nr+Ok7xDxZoP6WgeOek5rNVuAPN1YfghPNHTHevribDMG1bz+jEgN09QDkNqnje828FC8CuiPx3mBwC5erwJaOUSw2PEG08Ph0+aZnmwQfyaalxOzB+BjywrV9S+R1c2fbhLqp/1qLrdde12FXOXMpPipXNPfrOPk8ylVxV0A9Az9px9G7eAkKWkub08mwR2UOFXi08OXzs6PN93R2RWRGi7CzCrjv0zQfhYWHGeddNK4Q/7Zm5wb5PhV9bqUXgO1r8O4AfpZUZXMnjWFgwlfPXmJLNBVEYQRSso1n+4lYgQcEzZCmSzijzkZm6/vJT+NM6z4mCEhua+O0HlmaJ2gKL3WkcAnfsR74UNZOfvkDFvUakOlX42y6OWz//OAgCTSTno3UX3uO2GIfkk+nhUqi6iKHqDZLU3NpLRKcOraBNxQ= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?c2l3SWxRRHQ0UHhrMk1jei9sWnl5cXhQeDJLZUFxNVdVVEJsWEQ1QVMzaGNq?= =?utf-8?B?QW0va2dpOUF3OFpGMVkrR3M3dTZuSkVhMStxNWkyNmR0eVgrU2RkNWx0Z1Rs?= =?utf-8?B?RWpGVlIrVDlpUGJDNHhFajRmeGdxamJQWENSNkk4NGc5UTJROVVGWG1IbnlV?= =?utf-8?B?a0tubTJjZXhRY0ZpVlVGY0J0TUVWUmp0TGRqRTBvOFNadDFXUDVZZTJqc0Vh?= =?utf-8?B?ZXhNbEZpcThDcmRTby9GSUVoSnM3OURFVWtuVzdobXJUQS9HbkxZZ01QWFZU?= =?utf-8?B?RjR6RmhhYnhDdGJwZWUwSnoySjBFemk3RFpoNDF2UThXQUFnNWUxZ2M4RzJE?= =?utf-8?B?UnR4bTk0UWl2ZStVekJ0YzkySzMxY2dXdVg3eFZkcUNpL3k2VVJTN3lXY1F4?= =?utf-8?B?eFltMlNOTWxXbjArSStsVnlGbDVTU1VnaU53UzRxQTgyM3hEeFU1VHcrK1JR?= =?utf-8?B?emdQdTkreTVMRENWY3cxYmRIbFJuMnQ5dDZFRDNPS2hKVVNCeWRxcXRPZ21j?= =?utf-8?B?OFhkRG81LzZYQjBacVRIK1lyUjlEWWJ0WnRETEx1cFFFWVpPMS9pREZVdEc2?= =?utf-8?B?RGNyWWlaYUZWRitWQVJxbU52TWkxTVlKSlBsSXBQMTZsTTRYcHNuZnN4N3Iv?= =?utf-8?B?WndPU2dMUXVmaXkvcWdvYzNYclN5ck04OXJUNE1nTnV5TjZIMWFSR0xDWm5I?= =?utf-8?B?YVMyOXIyVktPR1J4RkZkUU15aDBZdlJDUTV4NEs2Wjd3REwvR2k5a1MydC9l?= =?utf-8?B?V3ltTTMyWVBhMzBCZWYySjNyaFI2ZHI0dkVvTlk2cnpiZllWYWtBbk1yN3l1?= =?utf-8?B?YjZheWNCWERidkxydnZwbm4zcDVmK3NReW5JVE56T1B6SmhHNEkzeGtObFNJ?= =?utf-8?B?eXhwUTd0K2JmenJ4aWtTOWFoc2I1VUJLUlhoeUxyQjloWFdnV0RveXNreFRL?= =?utf-8?B?SHJqcTJuak1TVW9xOGJyZGNPZ1dWYXNhdHBRS3AwTjVUK01uMlc5RjNSMU0y?= =?utf-8?B?Vzd0emh2L1l1L2hyRW9YdVJhczBBUmFwQlhpUmlWeGl3MnJxYlpidXdCdVIz?= =?utf-8?B?WXNMcnpNSERqcTdQbnJxenZ5UktNRkplMTRBUm81QU5xRmd6dm5sempuS0xs?= =?utf-8?B?cytRcUJhb2YxTDB4OHlCUUl2VUpEK0xhWWxxelJ2U2loS3puU29JOStXTEgx?= =?utf-8?B?bVpqaFdlQm5xOVJwSFNBa1d0Q0dRRkdaV21zSVB0MzBha2JkZHdZbGVFK29u?= =?utf-8?B?b1A1SFlpWnZGNkxZeTRjbmhsNTc4OFZXL2FRbmQ3akFnc1NDQllyUWk3Smd3?= =?utf-8?B?VERMMFhKMG5uc1R2a3BOTHg1eXlRcktHV0JpOVV4MkJvQWlsZlpoZzVidWhQ?= =?utf-8?B?U3c3Wi9UODFqSlA3S1YzajVxOVJnRWJkU1FnMkQzYk9qOVorRWlwcnFkeGk3?= =?utf-8?B?Yk9Yd1FSbUtqUDM0ekpncGVnQ05odmg3c3RrdHVoVjNXT0R4S0ZDbDhtczVw?= =?utf-8?B?Qi9Ba3M1ZEt5K1NwY0hTdzlzWCtrdVByYUFVWjRMeXVkUlJ4bjlsbUZESjdk?= =?utf-8?B?d2N1clBLK1BmSHZGdXh2VXhuRTRycGRqY0hiMlRLaW9wUDFZYmQwZzVGTXJr?= =?utf-8?B?QXBNaUR6VUszTnJmSlNWRFJqK0w2T0VRa1NmcS93RmlXS0RUSFFnYjNPOHR5?= =?utf-8?B?ZWhCUDMwMVRTY2ZaK3lLZHN0SmN0RmxMcjg5ZDNkYkRGekJDaFpxS0I4UXkv?= =?utf-8?Q?o+cI3wiB/YULY8SitXypgU41QM81GTbLGQL7yle?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b3b3a6e-42f7-4d6c-9099-08dacee3f0fa 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:52:42.4072 (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 23/31] avformat/wtvenc: 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: > --- > libavformat/wtvenc.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c > index 7e28b2082e..977e16c5a4 100644 > --- a/libavformat/wtvenc.c > +++ b/libavformat/wtvenc.c > @@ -670,12 +670,12 @@ static void write_table_entries_attrib(AVFormatContext *s) > { > WtvContext *wctx = s->priv_data; > AVIOContext *pb = s->pb; > - AVDictionaryEntry *tag = 0; > + const AVDictionaryEntry *tag = 0; > > ff_standardize_creation_time(s); > //FIXME: translate special tags (e.g. WM/Bitrate) to binary representation > ff_metadata_conv(&s->metadata, ff_asf_metadata_conv, NULL); > - while ((tag = av_dict_get(s->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) > + while ((tag = av_dict_iterate(s->metadata, tag))) > write_tag(pb, tag->key, tag->value); > > if (wctx->thumbnail.size) { > @@ -698,11 +698,11 @@ static void write_table_redirector_legacy_attrib(AVFormatContext *s) > { > WtvContext *wctx = s->priv_data; > AVIOContext *pb = s->pb; > - AVDictionaryEntry *tag = 0; > + const AVDictionaryEntry *tag = 0; > int64_t pos = 0; > > //FIXME: translate special tags to binary representation > - while ((tag = av_dict_get(s->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) { > + while ((tag = av_dict_iterate(s->metadata, tag))) { > avio_wl64(pb, pos); > pos += metadata_header_size(tag->key) + strlen(tag->value)*2 + 2; > } We typically use NULL for NULL pointers. - 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".