From patchwork Fri Nov 25 01:30:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39428 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949549pzb; Thu, 24 Nov 2022 17:33:53 -0800 (PST) X-Google-Smtp-Source: AA0mqf7P9TIuBsDPiJC6tckrjHbpJtdFEAlQYcaiXj/YfXmBGg9xZJOAcwrBBRh4W64Q5iCX5als X-Received: by 2002:a05:6402:3895:b0:468:15f1:54b5 with SMTP id fd21-20020a056402389500b0046815f154b5mr14294928edb.8.1669340033033; Thu, 24 Nov 2022 17:33:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340033; cv=none; d=google.com; s=arc-20160816; b=UJkeOd9ICgjkB+5P38kEffobGrb6RU8vm7zHa+Luy3JXkHQZBzeCnlxifpniDEbhwW /kkeyf5MKP70JCAkcO5NZ+LbzXwdTW91oszSKXa9izHGPMwwvb1onxKQ+xWJfFjDphWT zo12lz7mkipbDdEBSp7hTEB/IuBOylUAMBDvfhis8rMAlsPRqa6toDJHvDkeXfe0Yrx8 VLnaLhON9lJr4mWKXqZd1/1DyXMhlMXv1gXj6pjGsvK+uS5jk4vg2Y6GDDYKekIb8+o/ PVTFzMUkMabrnINBzk4BTipsdvQuGRZ6p0v3JBDyJAtcWG37txBwO93H6Zam2iWKpIkI 17Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=s8e2gL7Z29f+Y2qF0V16dyW7yoToqDD9xhpvILojC98=; b=I1/WSgqsUhHAuFPYbm0yStwaaNO91F/+QALa5JJ0BsfhqsJ0Rte1aPxVVpjlGpHZdM PqySGLBOA7FOkAeeI6sK0TPrDcz8slJQU24qzRf0iG9GeFwYRhmhMCbTX0y7fui3Aks5 4A1tCqH/PUhBJIV2vj15EAQoAd8NrX9JKnc6xYTCnHAHcurD54ofzltKXjickZv2j7sL /Ui+54dHc04RbrKYgniH3Ha+ljBG0mIqNHOhqWVO1LF8WM4BKDfF2ZVnKYW7ciimF19Q 6tpYd02OnNjEjxwa8+131MMAwHCwMtf4S7kFEI88e1LCYsoVaiNej4gZobWMlTVdaD4/ uM2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Q+9JosW0; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bk9-20020a170906b0c900b00770872942d8si1514482ejb.958.2022.11.24.17.33.52; Thu, 24 Nov 2022 17:33:53 -0800 (PST) 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=@gmail.com header.s=20210112 header.b=Q+9JosW0; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4422B68BBCB; Fri, 25 Nov 2022 03:31:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C39E68BAEE for ; Fri, 25 Nov 2022 03:31:08 +0200 (EET) Received: by mail-ej1-f52.google.com with SMTP id e27so7192371ejc.12 for ; Thu, 24 Nov 2022 17:31:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fUNUi65vhjY3XsjjiMDMEIss5wk4XG/e60tkD6AkBfk=; b=Q+9JosW0jMeNK8VglIKzXWNtaP5Wfdmrt6HQHmmOxrhC85ckuchOSsKr2n5USWUl2s Xj8T3cofkCZoN2zdjRTSruUgmqHPapCqJAorxXMby8CUbE9zKkoi+vSFnvRGqvarPNPo Q5AzXvW1j3ZunaZh8D8NDmC7kfWN6OjhzSZpvXgac1CY/hlnH6HwcKGs5n/TeCSfW37H pt4b9XVU5XfQaRF6cmi4qywlxHgF9rUMCZDLS62/pv1b3wpDaPCH2YljBX37pETHZD+9 yWGytaa5LS+YlVFb5tcGVzSwj2jcQhZSP5FissUe2EjRmqoBcaaeXcyoxl/5BC0VacZ8 qTzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fUNUi65vhjY3XsjjiMDMEIss5wk4XG/e60tkD6AkBfk=; b=dVOHsT9J2gMZFfpG9XliR5qjqAuntrUhN8AunhdjWlKBXdMuXZNYy8puBMK3IgKs1T sKKCipgMtP8oMRuZ2q45SNhk3u+oqhdV9mw0gQDVuaASUqZbz0yDVzQA3U0nyas2B7eI 6MQbpO6Gnjqjv0nzcC5uYRCDoRzSR6rOidRXrTREykBQT8GE8TEyWuR+dkfRFRPBAqdL GlUO4OIPAa/2VU8iIxlkaSnsasnJ7yZBlt/1kjXYF4LGpUAu4yceATEy6tRfC5vj1RmD qmEQSdwbMCeGdk1H5kl8c0wHNX5/XkpsWE4ZnBySj3rgQudXNTOVE1DdVyH9TbAn2ara Ri4w== X-Gm-Message-State: ANoB5pnlNlxHHT/3TllPWVVZwqBDAoyqzwVWPl2fIfM9YvECXNFhBHq+ H7uTdIJjE4Dl5yqYKj15nE+Xs5O36VU= X-Received: by 2002:a17:906:dcc:b0:7ad:69eb:90c3 with SMTP id p12-20020a1709060dcc00b007ad69eb90c3mr30656364eji.285.1669339867550; Thu, 24 Nov 2022 17:31:07 -0800 (PST) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:07 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:35 +0100 Message-Id: <20221125013046.40904-21-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 20/31] avformat/hls: 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 Cc: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MWG/W5DpmwsW And constify oldentry too while at it. --- libavformat/hls.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 402eb2b5a0..926d053939 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1104,10 +1104,10 @@ static void parse_id3(AVFormatContext *s, AVIOContext *pb, static int id3_has_changed_values(struct playlist *pls, AVDictionary *metadata, ID3v2ExtraMetaAPIC *apic) { - AVDictionaryEntry *entry = NULL; - AVDictionaryEntry *oldentry; + const AVDictionaryEntry *entry = NULL; + const AVDictionaryEntry *oldentry; /* check that no keys have changed values */ - while ((entry = av_dict_get(metadata, "", entry, AV_DICT_IGNORE_SUFFIX))) { + while ((entry = av_dict_iterate(metadata, entry))) { oldentry = av_dict_get(pls->id3_initial, entry->key, NULL, AV_DICT_MATCH_CASE); if (!oldentry || strcmp(oldentry->value, entry->value) != 0) return 1;