From patchwork Sat Nov 26 14:46:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39478 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6218955pzb; Sat, 26 Nov 2022 06:50:18 -0800 (PST) X-Google-Smtp-Source: AA0mqf5kKiePbpj7dkylMggHnJ8eRrwTvfIKFPDnPCedT8ITBSDfthl6udsMrmNHEeUwySm7rbQ/ X-Received: by 2002:a17:907:767a:b0:7ad:e518:13fd with SMTP id kk26-20020a170907767a00b007ade51813fdmr36843458ejc.323.1669474218136; Sat, 26 Nov 2022 06:50:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474218; cv=none; d=google.com; s=arc-20160816; b=L9l0xlPQKG56+ZesthjG3Afie19HQc/lAEEA/2t0D9JinQUwzcyZvBtL20VL0Hqmn5 +q7R0thbsB8j9kSHwgPmwQbweBagle8de4TQp9LgYsXhWpBzLm5Rg5qUsHBkBQ9p0XqL u3LfGvR7dhKsY3guK2We7bylRJyzohkApxsdl+C9/h6207iu7a8S13PUT507FUlwjtJu W0zyRtaLugD9THFlGEThoZQi1y8Nnw/X55FbpWtOrTI++Le26JOGLrAp3aQ9kq2qBj8C 0fT/sZQsleguH1re8C5cCjqG+oR+VK4L9HTE6JlBK/CBsVg11n6b2VxX9XHS+xYUPsxB SpeQ== 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=YPa8vCOR7DYaY/1CYpol0x5z1jItcc7li2/6OzE998M=; b=XfE7wEXfX9lI7o+X9Ru4vqcCnk9sPq8LTzHpBsr4ziSPElP61CIh84ujexWKqGL1ue o0tjZ5isoyGiLVBFGGrv9bkZtZKAQ30Qen+CudECgTETLHqfaxwhNK4JXXS4RL8l7LTs 0moGcgOsQSlwpeIS+dIQ+IkRMH12FFwR0kk5zepUTQObOWgxq8VY5srQMO2Kzkcx2VBg CI+KBCWxl4vJ7ueCaMwTBn6pcGZrotegwDfOzwBzNbiZ+WZ6vyMlk3S1Lftu72+RSzDi zC8C617pAyL6Eqp1JO9/VyGYRlsDHV1Q9bXhxTUOcOF9Cuww2rOrvdXlG2EAv6RYFAYx VIHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="HG+UlO/L"; 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 fd2-20020a056402388200b0046af62544a0si1092174edb.401.2022.11.26.06.50.17; Sat, 26 Nov 2022 06:50:18 -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="HG+UlO/L"; 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 E7DC168BC86; Sat, 26 Nov 2022 16:47:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 755CD68BAA8 for ; Sat, 26 Nov 2022 16:47:14 +0200 (EET) Received: by mail-ed1-f45.google.com with SMTP id z63so9903359ede.1 for ; Sat, 26 Nov 2022 06:47: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=GMt7XSIduwtghIOM2O5zxV9OVKvic4KLdF7gt4tWzJY=; b=HG+UlO/L1E3bsVcNgoejsHZ2IeKb51sn9oCtiiLmQZEvfZ5naQ+g+NZXdFoGDzcvy8 YF0iXIW+s3get5sGY2BP94sMWbYTXqyRnKoyzlKX/zuWIFkZYh1N9Vpf9B+EzZpaYtTR Kq1/LYJvIkKEoGgEM+eNxoZGWTLRE+B5PFGas8iRirNdjDcHHBv6Ue3GbNSMcI10aSPe nvD5NsLRdn36KwmrITwASkfSM4Z2nZKwHJShZzbNTkiYsA788IuphwA4m1KIxYCaaVkt BeNXpSvfGyJCi+WNREP5J1/8bztdaENFJrgaqW0959P1VxCHmuua/PPGL7p0/93QI3wL 0+zQ== 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=GMt7XSIduwtghIOM2O5zxV9OVKvic4KLdF7gt4tWzJY=; b=YeWN8fsKNZ+Hn58rRNcn6OgvMNvIDe33ZxVTL9wT7Qm7iZYfQbr9CxAl3FtrVvi3Mi CG9YWUwNCuJjAYT67d8mQd0ZeS2wjZtpPeQQOdOhY7AEIeFkEkQ+AOyZDYNWSa+OP/lb A4AzhVfiE8/Z/QP5GMVEcSNDv9aA9Ixb4U/7jwneMOjEH1OrpddwHl0NdHVe/rBdKL2A zDU6m0iWo7HLp+uQdg9AR0Jokl3v4Swm7lmTdREQREIT8zVElXBu7FpbhEFPe9J6GOf4 xEtzKyiEXdCIOnC28rD0M3pOI1Py0X/oc8jd/w0VQfcsTHvfiAwunRcTUMTk5Dh5tSpL H5WA== X-Gm-Message-State: ANoB5pmblW47KhU4Q/N5pIPJo2ZneHrocQU9ygYkamMBri5h/9kEW2Pk Y1S5ccc3tleKell65ZByIRJ8DvJScG4= X-Received: by 2002:a05:6402:3886:b0:463:ab08:2bc6 with SMTP id fd6-20020a056402388600b00463ab082bc6mr23364869edb.143.1669474034199; Sat, 26 Nov 2022 06:47: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 ay10-20020a056402202a00b00461cdda400esm3107745edb.4.2022.11.26.06.47.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:13 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:40 +0100 Message-Id: <20221126144648.73162-24-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 23/31] avformat/wtvenc: 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: Dse7JLcFR7TX --- libavformat/wtvenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c index 7e28b2082e..62dca62b06 100644 --- a/libavformat/wtvenc.c +++ b/libavformat/wtvenc.c @@ -670,12 +670,12 @@ static void write_table_entries_attrib(AVFormatContext *s) { WtvContext *wctx = s->priv_data; AVIOContext *pb = s->pb; - AVDictionaryEntry *tag = 0; + const AVDictionaryEntry *tag = NULL; ff_standardize_creation_time(s); //FIXME: translate special tags (e.g. WM/Bitrate) to binary representation ff_metadata_conv(&s->metadata, ff_asf_metadata_conv, NULL); - while ((tag = av_dict_get(s->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) + while ((tag = av_dict_iterate(s->metadata, tag))) write_tag(pb, tag->key, tag->value); if (wctx->thumbnail.size) { @@ -698,11 +698,11 @@ static void write_table_redirector_legacy_attrib(AVFormatContext *s) { WtvContext *wctx = s->priv_data; AVIOContext *pb = s->pb; - AVDictionaryEntry *tag = 0; + const AVDictionaryEntry *tag = NULL; int64_t pos = 0; //FIXME: translate special tags to binary representation - while ((tag = av_dict_get(s->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) { + while ((tag = av_dict_iterate(s->metadata, tag))) { avio_wl64(pb, pos); pos += metadata_header_size(tag->key) + strlen(tag->value)*2 + 2; }