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 7DEAE4A01E for ; Fri, 17 May 2024 16:17:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F372568D25B; Fri, 17 May 2024 19:17:36 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2071.outbound.protection.outlook.com [40.92.91.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1D3968CFCE for ; Fri, 17 May 2024 19:17:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HyuTZXjOVGZ8Lrw5mAFVJwZzJ1y5k6uiUGWxs7GvMUNEenTw8Zw9tISaKMURwmifN5ZmHl1saPxHYhzkqGDJQDzZr5Rc6m6enCg4WeqIBk+kQklgwoOT0e2x4qFklGwkznsJr0HdXBSjKNstyWvXVDieUywNjOAOXbcl4ZzJBbeq0cEtMOf7oFHFpTnxnbQgULZpBsqpoJ8Qm5WS+aVgAnlszLqBweK8yWEjVZbVZGfDggeq/3vxq9q4zKVAlmSi9rdzaGHoIfx05vIEeid6Wgoil0k1x5X2IBuSQVEyoQq3Y7M8soXxOv7grHokV84U1SnUb9UVbBQ1FmsOF/Tsww== 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=M818/BjOeUBWNB5hEsE5zHNwfBRwzEmhdMMGEI+9yRc=; b=jPmm19B2MJlSDHyNjHwhOTN3Qy40d/FsSZ1VGqscMNVPXJ4BF5XuFsu5LfA99j2dd9CVO1i1Y9VOpoxGWJa5tr9Z6vgOAwGsJfs+TsBpe3k5uyTRYrE34RZ/x1rzA5DUYJ9eB1Nn3pPWwLl8HNx9bLDk44j+tYtZdY1g1BFO3HfeXYFofjYK9i9/MDijOdhu5DR9v388B0kP6RB1OIKaP5PVYhsH3poFM80VHVC+nL2S/u6f0DuNKnDufHKUOevXZR2x8X0u4LbHOFmGfqI9AeaLkMmTs+EuuyCVsBsjIkN1gADFUDIK8ofn5pAvzzkoZ456u7lH4sQ0oQwbBuk0cw== 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=M818/BjOeUBWNB5hEsE5zHNwfBRwzEmhdMMGEI+9yRc=; b=g11tA2V0uNt+h/kAPuGCsrcgWJBsn4dQyzW9mbMMe8g4acKC97/lyvAEt/IIZUBNIZetXl2+3rjkGP/7lcu3VaFnoAZotHvaO8vgWv44rxiBldz1XvUSiaI8Wnfwkuvcesrs9912caHhvaepNm5VU2Gx51ytQSew6EErYbKfwJHF3jRmJmm3jc15NurCSwdC5oYz6D/oYWtKNe/ydJqIQ/9IfQgGtNT8YS/xXHPviktS/0bbl304CqJeXwvLpCJ6q4Zoz8wlfjC4zQDT6nGW/BNwpMvucpSl/lVe2RKCbB2gvAcQTIaZe/Mgk14LTDSHcAbYdngnWEnwgtMZNOf6DQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0162.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:175::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.28; Fri, 17 May 2024 16:17:28 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7544.052; Fri, 17 May 2024 16:17:25 +0000 Message-ID: Date: Fri, 17 May 2024 18:17:23 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [+km3XCexMl9Sig/GYoSedtXSOtnmTdweZgBgisCtPrI=] X-ClientProxiedBy: ZR2P278CA0063.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0162:EE_ X-MS-Office365-Filtering-Correlation-Id: bea67eab-364e-4d16-f8d5-08dc768cd71b X-Microsoft-Antispam: BCL:0;ARA:14566002|461199019|440099019|3412199016; X-Microsoft-Antispam-Message-Info: U0kfLnK/1RcJsoQFaBJL6aCaq333kXPoJCRCRAGMcxa2Oa04Gxd2GQKkRIFX1dBHC6A0MsuwWP68MZO3EDNkeHKuNQM1L4eMgMuf1AQwHPi2GMkBhGDXsNQMIts2qc7x/CfRWZreN5Z7qN68DsnjzkaYaCqOfvgyv35NGaEd1g9FAybmdAAQ36yVAvp13j4yCBQx8fES4oAQF40YcyeBjpyoSx9yUlQQT297YKV3yP4Vxjh2buNNmvyo5DharaNifWz6Iqb0DdIYrjDkEjrDF8RAcZDJN5YnGZ8BM15ZUfDoj0XxS8rVmwXUhmud3jQMDa8Lh37EYcAtxS7bXRF+ImglCUj97lBcFxxH1WdXyZKXlRNwx8mFLbySwEBziEncEJ9c9xOyzhLkuBu/Oe4dvt1CWcX8lAbPHNsyaTrn2g09VBTL2fa7O3SbDFWirqARz6eeuiDZ2HhAZ16a+G5IiWYxBVfDcb1njuA/x6nzYBMJprToYGyYZpYTDzLknxUexKCN5OHzirEjaj8JT/rMwEX+LwWlzdbweT7X+pRwQMX9k5miL4S7W5Ff1uGQf1UN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eHFxa2VxZzNPRW5PQmVGclZGOWliYlFPM3RqcGhZZExHQUl2elg1NE5laG5I?= =?utf-8?B?MWZHaVpHZFVaK2RqRFRBcm5LNTFmeXFUaS93R2VZUUxmKy9uSWhHNWJZZUY0?= =?utf-8?B?NmV3VDZnV1RRcjlOd1A2Tjg2a1Z5aEt1Q1ZhT2Jid1g4TnI5azQ4OGd5MTBh?= =?utf-8?B?ejg1K2dybGVyUC9pamNUamt6VzZZYVRaUXhBOUJuckNuSG9QcTJ4QWgxR3Fj?= =?utf-8?B?MmRCbExDVDJiV09rSEhwRjlZajBkNWdwZ0QrbCtLeFVpU2gwV3BlQnlPZDE5?= =?utf-8?B?aFdKdGV4NzJ0Nyt3bmdsSDIwVUR2Sk8vd1d2ZVIzRmZRb3JRcmdWMlE0U0gw?= =?utf-8?B?YnZBWmc4RDFsd2FLYVdyQTNockVEZWRvVXRhT0tUNks2MFI4RFVDR3lUM3kr?= =?utf-8?B?WVEyQVI2WWZFbk5xNk1TRHpQYmh2dVlxNWYwQzB4QlFhT053djRqTVJGUXFW?= =?utf-8?B?Q0I2bzNaSlY0SHZWNk1keEpEaDV0VGVMMmVuRi9ETTB6ZEY0MzBMVWVPWDhT?= =?utf-8?B?aUpicnErNmljL08raDIwdjJFL21XZ1JVL2U1UG9NYjIxRE9oR1VxVHI5Sjlm?= =?utf-8?B?L2I1VnBoUUVuY2lVUExOUGxpMzRNd1pZTXJ4UEU0bi9tdjg2eGFlNDZnaGZU?= =?utf-8?B?YjRSeDFiQUt4NG1Cby9UV3pUMnBLeVF5TkhzS0lHV2NlK2ZtVVh0c05JczdS?= =?utf-8?B?b3dyMTBlOFlQMGwrYVpzdDV1SS9OdUtzUGJxK09sN2d2cXEvakFVM2Y0ZnNN?= =?utf-8?B?SkZOS055SGFSKzBiNlBpdUYzTGV1cHlhY1FKWGlWeURoYVVwSWlERDhoZG0y?= =?utf-8?B?K1VwTVNDY0hmQjduZ2wyeFFraWxjZUQ1REt6Wnhzd085Y1o1bWJGLy9hMFRt?= =?utf-8?B?YWtlNXNuaDNKVjd2dTU3d01wUU1tSkk4WENDMU05YkxZc2wrRFg1MFU1Rmkw?= =?utf-8?B?dDNZOU82YzNITEhScXh6S2hzZDVwUUM5dVBDNlZ4ZFplaHB5ZlJ4VGUvb01t?= =?utf-8?B?TXY4RDVPUVc1bllya3VnT1B5bmlzQ25ESmNBcmIxb2t1d2NKVmd6Mm05ekpY?= =?utf-8?B?NmsvdFhMOUYrcXQ0ZTBLdS8yTUcyNjY4MEZuN0tzMU14aEMranczUSs2UzRH?= =?utf-8?B?WDg1U29kaEtwL2I0VEl2a0xmMlljWVBZZTIvdFYyT3AyTGE3eWJ4cC9Wd09Z?= =?utf-8?B?Z2o2Q1RNOWNLM2dRYmFRTlhPZFcxckJJZWVoY1Z2K25USmhBQ2xDa2FYOHBN?= =?utf-8?B?VFBHU0tLZnpWNXJ3d21OMWtzVk4rRVZTeG9keXZmOTU5ckUwOVJFNlJkaWRD?= =?utf-8?B?UWJwMjViRlZRMi9pSkJXVk9wVlBPMFlFUEZjRGYzMVNyc1VIeitOaDY5ZzRj?= =?utf-8?B?MG92MXRvSnZ6dHNTRGpkR3NYcDR3MG4reHk0OFFmTVZiMFBUdmR0Uk5CdW5N?= =?utf-8?B?WkVBS0k0MFFYWUh3bEFOUm1qYURjNXJURDFsWGJWT2oyQmx3NXFtZkFEOHJu?= =?utf-8?B?SkovaXE4UFZLb29KVDQvbzFVbDR4Z0pWYkdZNGJzZVF2OEtyME5yUGJjMngz?= =?utf-8?B?VE1qZGpRY1lVRnVidDNoSG9jWlJqcXF0M3QveXczT2V3Vmw5c2FTTFN2OHUw?= =?utf-8?B?SFZ1emJXOEtQVEJBTVZVY1Q4ZjlnZy8xT2lzSDBGVWkwQyttTU9mRkZ5SWVI?= =?utf-8?B?blppNHZoT29JYTNtQXZxWThzejk1ODBXdGIwUW5Na1ZFYlhFTjJ5REVRPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bea67eab-364e-4d16-f8d5-08dc768cd71b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2024 16:17:25.8282 (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: PR3P250MB0162 Subject: Re: [FFmpeg-devel] [PATCH 3/6] avformat/tee: Constify AVDictionaryEntry* pointee where possible 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: Andreas Rheinhardt: > This is in preparation for using av_dict_iterate(). > > Signed-off-by: Andreas Rheinhardt > --- > libavformat/tee.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/libavformat/tee.c b/libavformat/tee.c > index 1cbbb80dbb..87159681ed 100644 > --- a/libavformat/tee.c > +++ b/libavformat/tee.c > @@ -158,7 +158,7 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) > { > int i, ret; > AVDictionary *options = NULL, *bsf_options = NULL; > - AVDictionaryEntry *entry; > + const AVDictionaryEntry *entry; > char *filename; > char *format = NULL, *select = NULL, *on_fail = NULL; > char *use_fifo = NULL, *fifo_options_str = NULL; > @@ -172,8 +172,9 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) > return ret; > > #define CONSUME_OPTION(option, field, action) do { \ > - if ((entry = av_dict_get(options, option, NULL, 0))) { \ > - field = entry->value; \ > + AVDictionaryEntry *en = av_dict_get(options, option, NULL, 0); \ > + if (en) { \ > + field = en->value; \ > { action } \ > av_dict_set(&options, option, NULL, 0); \ > } \ Added the following necessary diff from the next patch locally: - entry->value = NULL; /* prevent it from being freed */) + en->value = NULL; /* prevent it from being freed */) - 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".