From patchwork Sat Nov 26 14:46:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39475 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6218705pzb; Sat, 26 Nov 2022 06:49:53 -0800 (PST) X-Google-Smtp-Source: AA0mqf4Y5cL2zPqJ3uRHsEdmjC6p9mOHz3/9b3iunIQEsOaEREolkCpDCPSW8kqMLLsyB0YzNboZ X-Received: by 2002:a17:906:a58:b0:7ad:b45c:dbca with SMTP id x24-20020a1709060a5800b007adb45cdbcamr25391745ejf.388.1669474192833; Sat, 26 Nov 2022 06:49:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474192; cv=none; d=google.com; s=arc-20160816; b=oo1xeqHqUCb8uP1y8ccygv1t2ioQxMgdNzQDJ+XFOo99qExODrOb3JLOMZZzAs8Gpf lxWLJ9vGneVPoqk85EeQkc8b4BD3QCmcVFkmc/xPZf8abDiZ0VJUY4x3uIUTxlxHL3om fe2Izr3H7abJwvse+JzjAHT9Y8JT74ZOYvzPQgWf4qEqym5aSVjvEqC7/49oNoEkiu/q 28e75zM0ruOeyYcFlQuCK0PEujbzWs6/c6BtHvI6gCMFrJK5aUby15ARLEDyHPu195xl sR6p5UOmQR9NMxYmXSP1AlniAUXe0Xj90hl+MzNuGpwgjXCKW2i7Ltj8iek/BwR8coP8 vPAw== 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=U7JUz+AVqR2p2Mb29A6Vdg/rMwqtTkZ7DiziMQg+tbMQWzfyjJWwcTKAFLQWc4Ejog 0qJuleQRumOlHi4jGo/2v1+nbaq33sj1MZ3tHhLn8lMJltWEQIhf1nciWiVk7vKH3pZH FEqQNHkz9EMkNn2+zwXrrjGuiYOjvu3RaEobM6KgQVr+MbJv5P7nejk8ZHmbVLo/kB0L 2Cg/PXW86U9/5vY1AFg5PrQPBezAx2iOh7LF8O+UQVCkGEd0lRZH1X6NmjrwzLPqovdE g+H4rURVBGuAz2uBWCBt1XCTZs456j/MPEOwali6p7pb7MBhwwDLf3Ue+aTneoB2ocBv 84Dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=FktcGiRF; 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 sg33-20020a170907a42100b00779a3220c5asi6300338ejc.343.2022.11.26.06.49.52; Sat, 26 Nov 2022 06:49:52 -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=FktcGiRF; 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 8312768BC69; Sat, 26 Nov 2022 16:47:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5863D68BBCD for ; Sat, 26 Nov 2022 16:47:12 +0200 (EET) Received: by mail-ed1-f54.google.com with SMTP id z18so9861518edb.9 for ; Sat, 26 Nov 2022 06:47:12 -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=FktcGiRFE/mjePXsIkqdr/E4YETz3OVWVkr9dulzxsvgD+NojXsnC5faYNWFuO5R2h OP2kvBms6HMNKVhv4NSNgqO/JCDqqvrQ5Bre4Ym72vGMnE43G+haHprViuWQT8/O5Ll+ tCfgDI4vuSiXDsftLBKsAy3EJH7bO44UnrGqOZvJwJMNZk5evcwva5ooo2neJR0wMf6q HvmmHDnN7vpC98zEcnrFeb8NfS8FxUqy3dE399fLtPGzKEI65NabCmFRKV8/fn/bNH63 WZ6fyWrSFosJHcBzQNJe8wBDRkPWv8NAw+gH0J+3j1J0mMgbWCJJaKLrFJ6DixyQypo3 +w5w== 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=kShG5cWAb7y4fWHa4iUBlIYjNnHa1tHpOxj2R0XxkHEcVeC1aLPw5bFow/LOpkV2QC oAGB3QBWF1g9D4aLUL9t2cx3Iqir/hb7942oy3kc0ES6A7bTWTNIyKQQjPEvjru73lzv CI8IJylAj93WtT6BvxAFNcH5qBb1rxdUkfzCTM1s066pYuWIyt9aFuKbNKi9WoQJXBYF g0ATizbRJju8/KUAtyW39O3RRu0+V9aZuo5rlagcHLiODd/xt+vb+9h2TInt76wYqv14 NsrN0QwB8u5ieTH88g7MEcJn5C/xTVGrSpkNj22YF5BPq+frROzSVRSDpVpoIzgC7HVW 4ZRA== X-Gm-Message-State: ANoB5ple4PNxHpxQ1Wb4DzaujQxDFF4wxdaFqXULp3yfQ2y3LKYQuBiI yh5tBYdelyaLA4EjmbXn7RVtJCFoc7w= X-Received: by 2002:a05:6402:2067:b0:46a:2378:445 with SMTP id bd7-20020a056402206700b0046a23780445mr19189007edb.221.1669474032060; Sat, 26 Nov 2022 06:47:12 -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 ay10-20020a056402202a00b00461cdda400esm3107745edb.4.2022.11.26.06.47.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:11 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:37 +0100 Message-Id: <20221126144648.73162-21-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221126144648.73162-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> <20221126144648.73162-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: G3ikF1/bju/b 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;