From patchwork Fri Nov 25 01:30:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39427 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949509pzb; Thu, 24 Nov 2022 17:33:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf5NH4j+xl+7OByNrdriqjzoaXyB+LZzF7N59ukFLEIfU9rLuj/YyDE2IPRBSpRrVKsj7PDc X-Received: by 2002:a05:6402:142:b0:461:7fe6:9ea7 with SMTP id s2-20020a056402014200b004617fe69ea7mr32118734edu.94.1669340025195; Thu, 24 Nov 2022 17:33:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340025; cv=none; d=google.com; s=arc-20160816; b=oEvU/WDyRfVX5MH5mzonLcQsffNzLwGjYIwVSbe96YWQbcBEVkGpNowqfKx4wwvim4 rF5XXTqP1ghIWzDMGCOBtWQQV8MTYpzb1wJX/7WpLN3EJS8E1bVlwVKjYV/rCpbB7TjV SSl3Hr2PfNEcFH2ER0iRy7uyDnY940B0TP2gzs1fhscaUsBpwmkI6czQpO4dLQRjPlHE sPCAn02wrrxxj45Oa6bGsODybZcUNnjqSNljDerQ1cOKheO6YMq1rbKEHGUo5BRIleEs vjWkE49qqiHdsg5pCAIJS3vujaLdufgnEsWNjPWRlwdy/wR2tPs6c2Z0coy61PyHfUhu 175g== 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=g1l1kUCmvyIC7qQxlUGpzFQTEOQSBimLi6s6I4c0fhoNxc0oEMRvEfpjSNR4JpjwX4 28GHKNzF/i2xN6qcS9WwEmdGdzCAl/Ubud7i91HS1WPCjNmaOetTkKwVn4RTlGMiHsnM c5NKGclVACYItT0ZbGpqTw5Fq9PoutwaXXBvlEaXI4410LIZpXr9aTQpRhOa3zM9GCa7 1C6w36pAw2S9g0/khFRKFa1Yj8aZ3Fds6W7S1Z7NLD6/6hNs57lviKBtk5nARKllCWTK 584KtrcYMijRDKweq22fGmaYffojqLERoKmCXgRlAsR6YBX9uf6qW7NghubOU+RQy8oF fgNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=b+TK7BGi; 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 di12-20020a170906730c00b007b5ce4a436csi1919971ejc.227.2022.11.24.17.33.44; Thu, 24 Nov 2022 17:33:45 -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=b+TK7BGi; 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 1ED9068BBB1; Fri, 25 Nov 2022 03:31:21 +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 07ED768BB90 for ; Fri, 25 Nov 2022 03:31:06 +0200 (EET) Received: by mail-ej1-f46.google.com with SMTP id ho10so7290515ejc.1 for ; Thu, 24 Nov 2022 17:31:06 -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=b+TK7BGim6ho68YTMI0uUQMV1XZ07J6v7Pzhe+PVf0lOGIieIrIMKwb1Ep8rGv0uao GLGHydC12TgtxWvetB8jNeiT++dZQwoe7vWFgMkJG9Y0jUcxS+XDiL4qUnVnAOoNT164 k6oOM7ReVpQABKDiRhTw8XDkSebnbZzVkTUCLEGwDlaWIiH+60z5kV7wE37r4x2lQCEk /1sR+ozjCwukkbUgdXIV43Bx5ltfZOxsf7yi1866y6fxlc63+FboA+F4tkXSusZ9s27Q KTslOFCr1VIVKq0hC6LGwjBxO4C+k9jNR/Yv8qE8IYDEXOZ/XulfTQWcZ4Unnb6IfW7S ziEg== 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=UP47j4vpSOXMzSy2ATCRpPvCo/VgMoUQpsY/8UGDCrBePgBUJ9EwUqcRWOP/6NIScz DE5Wssdn8ftNkI0vATpJDwdRlkE4fJUj1eLsqV7vcduP5oK3FgS1y5zHlWrKNtKII5oZ DfF+N1Qd6ZdK0AFHr1VuU4da23W3p6tCS1mScqliDohR6tcxmCG2ZSXpwBPj7g8bHUbQ Y8oItrm/JxcXRjIk9BS46zK4CiOMioDtdMPi0zL8ell1KSlJ9wwDboxaLP6IhusIcjSo UDYwr/6RWFWEpp1vITNzwbzKl0NxALvehi0jOBGIH6oFCZ/dUa/p8KyEMOS2yOujIPRX FGNA== X-Gm-Message-State: ANoB5pmdTTQapFTxoJd5dZdobvr8B0geB2/DBmfXr9nihgFbTK8N3TKZ +S9u1sPs+HwhVTqy49vmjbZNhhLGCbw= X-Received: by 2002:a17:907:7650:b0:781:e568:294f with SMTP id kj16-20020a170907765000b00781e568294fmr15867863ejc.447.1669339866701; Thu, 24 Nov 2022 17:31:06 -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.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:06 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:34 +0100 Message-Id: <20221125013046.40904-20-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 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: 5+CghWaZZ1iV --- 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")