From patchwork Fri May 17 15:25:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48954 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp2950866pzb; Fri, 17 May 2024 08:26:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUpK5Yh8N7FaQbvFCrx6cGhoFasUimLq2F9zVOdTx+JT7KO4zEBfxytRy2L4OKuEVKuFmqxQM9UVl37goONa6wNoholBx2qIDPkCA== X-Google-Smtp-Source: AGHT+IEw21lJKQhrK8nGXpa/bO+YXSW263BGc/Yx4dMGyfBjDykjTXuoSEo9eFIHcvCQHQCPQaIB X-Received: by 2002:a05:6512:3b20:b0:51d:2eba:614 with SMTP id 2adb3069b0e04-5220fe7a025mr17495397e87.53.1715959571017; Fri, 17 May 2024 08:26:11 -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 a640c23a62f3a-a5ce0c58a16si240139566b.759.2024.05.17.08.26.10; Fri, 17 May 2024 08:26:10 -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=IzPJnfQl; 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 4A99768D319; Fri, 17 May 2024 18:26:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2084.outbound.protection.outlook.com [40.92.74.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7111C68D1C4 for ; Fri, 17 May 2024 18:26:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ztm3CHnHgkk2XpPQnaI086U5MAUlccH2ggz+6ehUJZtOj0/OhD2xEPWKN0Go+ujow3xnLus4ESWvJufWtOQbPbceQs0jeDeTajtw+hWO1wXOp3hPrmymq1Dskp/lCYlueeDC4fln/NUZHOnkQ2vrTDZ32A+07GhMae7cU+REcRYSB67tEU4Fgzlm1oISt+ecCvUZ4TvexyCO+akLg3O/EXciJGG65nixXIfllpUIgfaI8A8f6VTCN8yrwaPCdrHSkG8LEqh9s/7e8+XHvBbA5s3YmIGp3Zuy8bfXpD1g7x2aRqha9FeFYlWNcoMdJLv1KmqIFKlK0B9H+Ky967wlZg== 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=ua6YVIOdLS0SOtXImDBvGxvd3dixAfACgAIQTmEsOTM=; b=UXTC6ySUrAs/Gmngnl+9oyrhKlq5RV7YwIw28Seku7YMbjXvPEj1Uj3sGI9NlKN4G9mupz4cQilHCtmxW2ZTY8jXRYvz3qYr7NGjt8/l7et4Yz7Juizhoq0U/NW+D05qxUC17h5FVlFywRuiDr7yCwz2/SJzES0wwaiW2b5mwkUsQGUGEyn/JO3li79M+3PlZZAWGn6rMcxYRrRLRDbks2IijW15XANpCJXyKkCHgkRiiNoh5Fya3B+vCA+6lkFq3xQgclBay20AspPcisYPO4gv2DTrIAy8zqzh5aSpwa0etiNsFXy7ZlgyP2gEWAG4nalsoDN6KUZJBywyZuzsHQ== 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=ua6YVIOdLS0SOtXImDBvGxvd3dixAfACgAIQTmEsOTM=; b=IzPJnfQlIs1NhhFqvBshKmBdsZ4nBDjxrAECvHKAKNbCztluI5gE2bomS0OGnqknHjVemih8QmfzeO7PtYuUMDkf9Vkbw6L/v6hCcMd0ev7Ru2JRm3QYHRdSVqRPWDhiXtwtNBSt928EXG00GJjE8J20MToChN8pnZ6glihUcHH3p0QNhUvQOi4+d+X2SNob1lrYt9Teue9tbyetHT5i/7sfhX4qlOTyYteIHyu2A3SCpfeLTsKjMzi5ntxyLtdtsY1e7MCObdNDUkqUnvuMBeMNC4iznpRLhPxXKm5HXwVcDJovq1Dbw0fLp+CWD95LC3eyjPre1oMTKeOmdN0hwQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0048.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:23b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.27; Fri, 17 May 2024 15:25:58 +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 15:25:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 May 2024 17:25:37 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [ntwBic46SvXnuSHvm2nMZBDOtTb9I0pYvWCR6KWYepk=] X-ClientProxiedBy: FR0P281CA0269.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b5::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240517152540.3794055-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0048:EE_ X-MS-Office365-Filtering-Correlation-Id: 5584b28e-c687-4c27-09d7-08dc7685a72b X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: zIvEY10LDpvZU7zQdh2ObWqbEs0zw+fy8N0tfeWGKn3R6WLdRhlT92js3gHNKsEde2J/j6Q83/2BkmTZl8QDbm5K4ipykP0rzVGF+NBMD8XNn+xLs3bLeFb1yTK7LDWwbO1acxLWZbqEmj5WZjLvE9LPKAoXJxtqma6g1L+lJrXL3v3LGp6gEWOO8tbNbFitXdTIR6/GdRQy4OmCfOJVZ0yDojSCeg2bAU28QHV19NFhP8PWXPENzbiZA0/phs7tdQpKEm9dMrfmaMg4ctlw74bgMfhKT7gfcCP9Z4JxrToindcH/QX74VXCARU3DOVcRdKuGDzHyuOD58/3vIE57VdzGpKxEVyORdzct83kQCl95953n7tfgm65dxHEiQF19iEEN0rIwVAuob6pMU6PSFbmDwVNZkQJgcsGq5r3LIQUCp7Lh+HG3IxmxNjNEEqMDa09yeqH5/IBglMpNywHafFHLqUL+nRrgBQEM030ciHvqok0rsvfad1DM3y7h5vRAtLvgxZmCIL0GXeVD0kj8wA3B2fVtP7t1DPuwLjkoIqsbdP97CLgcJC/dgmg8PqFD4mLmcSFQ43S4q2s+2FKSUNxqjOZ6Ld1gtITXyxUL0tv7KSteqwBpKk0TXQgUwnj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: F5T1ytrHwuIFTtQ2vXFX5HK8El6KeZFjVTAUs8N4YR/HODAy4KRgU/RPNR1pA7ngsNpiqRc+XtHCz+yp15YdzXNgit7l9iWbCF6EIlrYZsgw7ccb4beHXGn/vSckmV6sf0fzyIimHxDBWTN+xQK7DAtH/KuBZeuPW953XTGmZSsexcTSQBm/lIaCyCzdx3ItuFpjjiadr292RtKGnpa2veAbzlHnEQHss2sfdc1io+FtN2nnk267UoJA6+gc0dAOfCjdNRozx6/MYQKcmpE0xFeQNcURnaWj1MmAx3YF3J1oH8cqYbgqzoOwrL6yA0Ch8SrMmIwRmST/u/3DHylwTC7jQHb1FWTGhDvglhkSidW78utJvT5gA4FPwEd+lusdBo6KLfRXwBVZ7f6fqUTpTHq98MzGqqx67kothaigP7C3doYpWNJz/NNYiHMb22MjNr6JELU8tqvouOMj9AVqdgW81zv891/tNksEDF+r2BgmjWsV8QGhuOeStySPYhX83UGkGOcVVMOW2nYtbW7pEI844w1iZt0IqkxCZbxjzR29aJ6mMIuBG8yyWoUtkttm6XFjc9SNm0tzYGN2JqH5ir3frXnVF5K4Kd72SymXSG3OkrtFfnVFDez7dxki9BradBpMyrbBXON7iY2ks6c29katTG2oMMeVlfu8HdnJdr0+eGjxFDQSp09kF85R9U6Hc46epUOZJrEMDDMW9fXD6+0UFPZsnYpXcy/eIpUUM0JzAuFZegBULFG8OwH0QCppebU78UDOMhDjisyul+UeSaLf7pSghD3sCCgx3TWqN3SXinf3R2xC4vLD17oaBBOva7kaZsydzjCiUudLHb6qrM5YVA4JB/UF5pBEuOA0lmha0KmZsC5n/Wyh78Vgrb1M718CP0kbz5icKV7d9ZO4YekQmkesGdgxW87Flnf//J6ImBQJajuBqgLdoCcXd7nkLfloZ+D/8Lq+pSQVfZolQpfeTm8xBPGSCuKGbh3UkxOOX+7aNgxz4v3Rjn6yqiqGWWFI07JSONoQsjZBTRV16Z4xwuUJV2emQPadI8V3lQFtMDmgPvqUWTqpNu9/Hgd4GHcVY5L+um11dwY9RmOGVtdPnt7b4uUvdiFlGl5Dj3kEF4ImI2hB62BHchsAUH4saC9lvbxb/ePh/8CS9U/4Gj3W38RWzKx2NwdqRLIv9kiPepxypVF60MsD9E0dMFkS3aHmhIplNDnbF0txSo49D0Dx9YmwAmVFcdpCpQq0f76XKIzsNC71icWwmxfomd/KGmKu/Z1SLKr//8f96ZW2aQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5584b28e-c687-4c27-09d7-08dc7685a72b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2024 15:25:58.8789 (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: DU2P250MB0048 Subject: [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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3/8niwZaEIW7 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); \ } \