From patchwork Fri Nov 25 01:30:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39435 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4950039pzb; Thu, 24 Nov 2022 17:34:57 -0800 (PST) X-Google-Smtp-Source: AA0mqf6W6x+diFUAwmnDvNrBrBI/tn/F/eemkiRjpq3LerO/LKhFLpKi3FOEs57Qw6w5+X3OMHRw X-Received: by 2002:aa7:df86:0:b0:46a:9fc5:479d with SMTP id b6-20020aa7df86000000b0046a9fc5479dmr3142594edy.192.1669340097152; Thu, 24 Nov 2022 17:34:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340097; cv=none; d=google.com; s=arc-20160816; b=vLTIYQ6FvOBVE2hbOP1PL2/U0Fj2FBdR414WTtTjwy32yarW6jIZKObX3rZ31dBniT TX5jxlXkwRde1MWTYFGP4m23RDkAtzyxa3aCqRwRmuNtMt5HJuov2o6atZZx4x/fEEO7 D9yov4smfkJko949adSEg3Fc6b9YGSr1nIkAcwKTfElClFsewiRy1h9xIV5k/kOa1h4H dLdgJD/mcQrXB9hSzHefcEIiMP42rikD6UxBiJLlltHbhiO3krHwbXImz5PRHOsRyQa7 u0COOLlzn78rTJGO1JdfBT73TH1UFo9+1qidFJexLoUu/UigmRNgVYpgDdTKOjhkD5uP D8rQ== 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=N0RyILuM/pUTnSzs898nJg6emaPgP9EvI1jJ8Gis8q8=; b=l2oo9pkyIUWEl3LT6FZ2KCCSvbe30HShA/DTeKF2gd//p79mKXQVReQlJMa/AAZkJa 3dz6pXAn/U5R8Mb7QRTgCgXD+IqZ7tEuNl/4Lu8mITwKMuQOWZ3ebRalgJbIn5ZwiJnz T+hjbKaEp9U+1ZWFF+NSkwyRokqluw7iM1WJxTgL7CTEIVd9q/SfmLxI8OS3aqYy6OuD LzOhApg0WXP8JtP8A+0/UvBM10K/HzwTOVelcaTUvEdkYxgt06gBsljwWUNOLF/65mj1 beCJdDHggDaSVenIHv9uC6wfzyJBWbgcMS+Pm0gVzq94vmdY3b8Fh0RzXFj7wq8Qkn/Z Ts3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=b1myw9Nw; 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 oz20-20020a1709077d9400b0078e319dcca7si1606829ejc.744.2022.11.24.17.34.56; Thu, 24 Nov 2022 17:34:57 -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=b1myw9Nw; 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 4661268BC09; Fri, 25 Nov 2022 03:31:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79FD468BC29 for ; Fri, 25 Nov 2022 03:31:14 +0200 (EET) Received: by mail-ej1-f46.google.com with SMTP id ho10so7290898ejc.1 for ; Thu, 24 Nov 2022 17:31:14 -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=VgLhnwDfUVeuMSRzpv/uSUy8TLeSA086jU8CqbYxcpk=; b=b1myw9NwT4IpSg1hzYmMHX4/hQmeVQuBhedAtK5V/kWhxL5NAOdHe4XWY5RC+5h45Z QwJybA9G1Z22JFB07nXAF0UCQb/gnZwLlKKqcX65GaGI52PRS/3ZL7H5W27rSn7oJ80m TYlI4gam/VqtCinBWmse/VE2NB5We0Wvm2GIEVohysz4fUtQagGmQ5wevbRhcwnS9U5e B3my5Js8khWNzJZyM0LWe2wZJDm2fNr8wHCBFZM0ZCqr+hWLA1WP2iK7xqLW827SCkGe 2TDr985V6De4bI+ZN1ESxi5H2dkCaTdhV4XZ0BMOPiozTlL3S0x3ekE5L85ePhul252y Z/2w== 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=VgLhnwDfUVeuMSRzpv/uSUy8TLeSA086jU8CqbYxcpk=; b=oyKOxL+Yz8fhqMrXfGl0BK+XOQypnvj1f3tWFNoUl7Q2DRoTYW2wZlYcfVjkQ2ROin Wu0ET4ep/4WDGaOdzQbo/8vQHRvGE/Y9vrJWEgzJfN/SiidLcz0WrNBj9hOWrq1leOLl Yam9laSZ12eePTrLkSU29rBkDC8m1d3c8JU3fZR8VOJwKn+CGCRl+BjynWqDjW7LTUb1 3F8P/9ccZkBhLNTv+O7wNbU+4lCqfzb+ZbSaTvBk07rdS5vpNppuR68FrpuuKmMDIAr3 dKCrOJfzg60WEWRE3hYmJy1pDwpaLrBODxd4q9Eg0zA11DJ7zPBElvONbboHKdSln7rI HbRw== X-Gm-Message-State: ANoB5pkzyTEXGfnywmFAz+0Fjnw3e80G22xBwOqAzGWF1bkA8SKFxjCt hPjAj1z6UJdOvxmH6sjwz8GU6oA/k7M= X-Received: by 2002:a17:906:3385:b0:7a2:b352:a0d3 with SMTP id v5-20020a170906338500b007a2b352a0d3mr29338963eja.399.1669339874201; Thu, 24 Nov 2022 17:31:14 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:13 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:43 +0100 Message-Id: <20221125013046.40904-29-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 28/31] avformat/asfenc: 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: j8HTLoC9tqMn --- libavformat/asfenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 70800a6df5..47240fc0a8 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -570,10 +570,10 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, end_header(pb, hpos); } if (metadata_count) { - AVDictionaryEntry *tag = NULL; + const AVDictionaryEntry *tag = NULL; hpos = put_header(pb, &ff_asf_extended_content_header); avio_wl16(pb, metadata_count); - while ((tag = av_dict_get(s->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) { + while ((tag = av_dict_iterate(s->metadata, tag))) { put_str16(pb, dyn_buf, tag->key); avio_wl16(pb, 0); put_str16(pb, dyn_buf, tag->value);