From patchwork Fri Nov 25 01:30:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39431 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949769pzb; Thu, 24 Nov 2022 17:34:17 -0800 (PST) X-Google-Smtp-Source: AA0mqf603LsmFTurWiZLA+mjZCdhDCbKKCFTVfVVY7N4mbSgAf7Jalw4v0F3GSi9m7U12FrZLJng X-Received: by 2002:a17:907:76b7:b0:7bc:aea6:e89a with SMTP id jw23-20020a17090776b700b007bcaea6e89amr167545ejc.671.1669340057571; Thu, 24 Nov 2022 17:34:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340057; cv=none; d=google.com; s=arc-20160816; b=I2rCA79W99E4nSdYD7g3/OPVCnsCvsroptmHWCSx3qEAfg10BLLBHZIZpPwkNzkSpa NJYG95XnHAFNFvdefDoS+Nfllq2MxZxZy47EZd1GxbZD+cnbJXgxgd3sMSp0SNTRuRqN h1oqaJ7tP9tEJKBSuaiCTplnVLUwwkR/3/yDxQNyRL1k8d5p8noLsQED0QUIrZcsHjEV U/+U7hST47HvpeSs/bBQdpf8SpaIf+WzGx918ljeKdcO1oc5sbW4KYmBVve2Owwl+KCi gHtUN2Mb0CM29/a2JiiwCguXCmOcmN1Tnmyj/Oa4mFTaVaqBJlf1kL3MUw7o1gnt9uih //gQ== 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=ydwl0HsgiRXVG8gsMv5oxGmDozvr2dCtKnV1mhxiwBc=; b=f3dWwfYhR3GXuOlKPWRNLJlR7o6v2ukJBceNTAkW5KhtrJNRa0rfzo+U7W+M/bnxSA s1aPyqNjDZvrq3/gKZrteBCbo0E78pcNo/YVamB1Yb8ExseKKEES8yqMAbhf3wmYnoMa j1S0i/6qFhebtQH9VGHwZqx5YEfge+BG1LWVn0f7uUH1FRHK0JY67VG5VXVz6zzCEYxr iNYJe1uwdX7ZQLDdQYwQmRAjHzp+XHH0G3NythNmET0jKrX7NlizT4NY4gAyzzAp430E 5pyDeHNTzeeVP5ik1HJ0jyOMv0obAbQEto1f80tsMEFL+NFEUfUd4mugwpWp5HcpDA8L mD2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qlNnFxqs; 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 g20-20020a1709065d1400b007b5ce4a4360si1249335ejt.151.2022.11.24.17.34.17; Thu, 24 Nov 2022 17:34:17 -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=qlNnFxqs; 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 61EBD68BC6B; Fri, 25 Nov 2022 03:31:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E775F68BBEB for ; Fri, 25 Nov 2022 03:31:10 +0200 (EET) Received: by mail-ej1-f47.google.com with SMTP id f18so7274329ejz.5 for ; Thu, 24 Nov 2022 17:31:10 -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=LeaU/uYPobn934gI6NSNXvdbvmf+ijFeIile+pZKTSw=; b=qlNnFxqsniUUWKeYOA7Hp4LE++Fz0tpB2BednfFTsGF26jhtlvnVpTd8BId4hxdhN9 07Tf64rX0lrjzLNuSOB3ujtlsEOgH5+eltOeJyBqtfrsj3JrrCLwlZ8q2AO5gohJVMzR rmlq0QU8M6ZBRveUrftOeXLAproZ+1ELZEjd4cVmunch/idgcla+OJcQjfMDugoraKit q3GmY8Yt9zPGesFAlZdZ3VJEnNexLgYZRYGH6s3mCPm01UxrPUoNJ514NzKOX4uFU1sr vWuDTrR4GeGRtbtMN4iZ1XteUz28xCtOoz0sFhQfux3HSNCTeJ9/bxt6aOo4+GKqJcvW ePiQ== 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=LeaU/uYPobn934gI6NSNXvdbvmf+ijFeIile+pZKTSw=; b=XgFZfgB6avb43wooSi4l3iqNFzmJ5IY0XxVLv2TuQg8SJ2F3NQD1EGelToLiOn/PKE V4NG10FjgoBcw2AylahsGVh9bmqMcxIjgBF0IB5kgdWkIfMWnzsJzwvrC8OsxIp8VwWU B4EKWfVW8lvJHcU3nKt2hx0KiRGfE3bKLV4hAcvz19F9RIQqeNwaVXod1dGmdFMsVncK wGhm/YjLx6lXqmzqJcQMWUiUnUox7drARcKCGgDFUA0iOqcv/NgfBGCsECYGNl4MCrJD t9cpGTQwVgoossKqRkTS8qUR5EwZ6afFjCADI93Qj+EkA8PAZtu1T5EvUrfwRzOYoW9I UjIA== X-Gm-Message-State: ANoB5pnnPux9qrv069HwuwNyiRR6RnJxD8vSxrEo/kPXvQCfllxNvlSx AJCwBSnUJ3Q3gO2UUX67ZNgI/yLD2xc= X-Received: by 2002:a17:906:b11:b0:7ae:50c6:453a with SMTP id u17-20020a1709060b1100b007ae50c6453amr29537750ejg.596.1669339870115; Thu, 24 Nov 2022 17:31:10 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:09 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:38 +0100 Message-Id: <20221125013046.40904-24-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 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: kdoNgaMPeiJq --- libavformat/wtvenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c index 7e28b2082e..977e16c5a4 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 = 0; 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 = 0; 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; }