From patchwork Sat Nov 26 14:46:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39474 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6218646pzb; Sat, 26 Nov 2022 06:49:44 -0800 (PST) X-Google-Smtp-Source: AA0mqf7fz+pGY4DBHZl19ENdT6hPz2EyGTVL1WGuNfJcEas27kLcXqZk7yylDzqwSCJFKvlxSsam X-Received: by 2002:a17:906:b84e:b0:7bc:85aa:4e49 with SMTP id ga14-20020a170906b84e00b007bc85aa4e49mr7422916ejb.554.1669474184337; Sat, 26 Nov 2022 06:49:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474184; cv=none; d=google.com; s=arc-20160816; b=p2OK7IbpyZAQ4uVCA08oArAjsPWmu0+ZMJEIuQvysjMkQUNuDTwctAupkIHuch+FIp FZcJO/pE8aqb966oPq10J/yqZbwkt21H7+y1sU+FnLyg35KaIUQ/NTR8GWMkZcIP+zNO cUCMCzXh10Uu7SYTNZaOyXKFScl4/tmzxIuctXrtfI6JXe0M/QlPHI6b6nHzO04ljCF+ jM1/7gIRwf1Pz8mTPXgZ+Y+yfjY5pyvqIw9mURhLMdJ6OUQk9tUA1Ys9moIldMpp54em vApXHh0GHUuO0Qezo7U7U7TXetE+CCVV3CRh7P2sYrMvLrgj/fD7q55mNDFn39P2hNEZ rskw== 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=T+7LZoicsXI8J0izCb1NEcZ0xiWFPyLBN7nUkk0ThEc=; b=WxFXgCEfkFoSmGCoqVK6NyyYBYu5IYx6QA15cyaw0JmYKxodpKy7D7UijNayTlNU61 CIocWjL+RmgZdwGotHn5GGy3TkvNT4+BI3ZEU71CQSUNO2Y1OXjrAYGovvR6hpfbGu0W B/A7+TJtNa4GwGkqWUBjonhW3AtMJ2/G4jUrzMOXQdjTfeCHarLvHb5EqbEoti+1AHGE bUuGYuyhj3QDqus5ghQ1cQgGud+x+SyprFz5OSr4ku6gAxLwu/oXMfUhEQqWZbYx/nQY O5uhyv3f/BcjBXapv+89xpq2zBtoImy6dSt6oVjan53lfJKpPIYIBUCWq0URYqhoWUp0 Gp3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qiZ7utwJ; 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 sh18-20020a1709076e9200b00774195db4e7si5823431ejc.117.2022.11.26.06.49.43; Sat, 26 Nov 2022 06:49:44 -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=qiZ7utwJ; 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 B8EAD68BC1C; Sat, 26 Nov 2022 16:47:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 34A9468BA98 for ; Sat, 26 Nov 2022 16:47:11 +0200 (EET) Received: by mail-ej1-f50.google.com with SMTP id i10so16072193ejg.6 for ; Sat, 26 Nov 2022 06:47:11 -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=bMoadp+AOwbOb60Vya9/jgvE5sVNRu1TX8uDqFbHqLY=; b=qiZ7utwJPg8IEoDQ4m3f6Nuxdg3YEqMph3gUxt1XbDnp94HuYzXXkOqvjo2fjREYJ+ 1EbHW0z6Rcalu24UzwZdoSm82O4m6vaZet8NtJzbq4dkNjELFAnOHubaVIMb/cXSi4No EiI1sgb0Gn8Hnz9UqJwbppTq5irczNcRGD0eyJYWG2T4c/weAgb1lflwPGOTkwjvp4yY ln313dW2brvaiJCs/U4agEWdnFfKSs7FIJI+XvlEGbmuSjcCWSurA+rxPCbsHh0dR1Aq fP7MeKKFagNbxynqwDqpg0HDHtJ34G3jQ9HAy4Rvh7EvqgJGGDaqBt1WSCS5U+lBx+ac DHsA== 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=bMoadp+AOwbOb60Vya9/jgvE5sVNRu1TX8uDqFbHqLY=; b=Ltnw194sgSNcY2/F6IfzedkcLRZixKAfdtxHIWcSMZr9AAaFHQLzGPCjOhHC+ta49s AHwwweV68WKh8Zc/29rf7YW7OVX80layCJi8XYRIn9dNG5LYVbV40ynXX+E0ONelZmsN txxSQKqpvgjfQu++DiBV7NCYlvOkBbXq/gWmN2yTNvO7nHzGt+clm+hS45bYTXSkDjDH Zu5FZDQ2PLYGm3XT225AxueswmTChQiyRmeD1DO6qKtKfWPPQ2ItIdjN+H6NATSbsLns jQC6snlNPGkWYNNKIlP6z1ggvQFU2juYtOVJ8UXkpaOB7LR96KpjOFh4N834o5efSWH3 b8mg== X-Gm-Message-State: ANoB5png4hxrt0h2XyrzhvsGPh4YIt36OIHo9dXmQwlIcixjbcnnEAZq NJyHkSNEQAgSH1vcivTsfwHmYoBW1ww= X-Received: by 2002:a17:906:692:b0:7ad:49b8:1687 with SMTP id u18-20020a170906069200b007ad49b81687mr26639346ejb.407.1669474031375; Sat, 26 Nov 2022 06:47:11 -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.10 (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:36 +0100 Message-Id: <20221126144648.73162-20-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 19/31] avformat/flvenc: 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: 6dj0rBRHbPt0 --- libavformat/flvenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 59be11eba8..128ae8ebc0 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -277,7 +277,7 @@ static void write_metadata(AVFormatContext *s, unsigned int ts) int write_duration_filesize = !(flv->flags & FLV_NO_DURATION_FILESIZE); int metadata_count = 0; int64_t metadata_count_pos; - AVDictionaryEntry *tag = NULL; + const AVDictionaryEntry *tag = NULL; /* write meta_tag */ avio_w8(pb, FLV_TAG_TYPE_META); // tag type META @@ -353,7 +353,7 @@ static void write_metadata(AVFormatContext *s, unsigned int ts) } ff_standardize_creation_time(s); - while ((tag = av_dict_get(s->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) { + while ((tag = av_dict_iterate(s->metadata, tag))) { if( !strcmp(tag->key, "width") ||!strcmp(tag->key, "height") ||!strcmp(tag->key, "videodatarate")