From patchwork Fri Nov 25 01:30:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39434 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949926pzb; Thu, 24 Nov 2022 17:34:41 -0800 (PST) X-Google-Smtp-Source: AA0mqf5I/ZvDF9nwloUh+FPx8HNUtbmtySB0JEFuaLUaIa/SM7eqlmF/3L89jDeV/tTOSlqqTvfZ X-Received: by 2002:a50:fc11:0:b0:45a:1bfa:98bf with SMTP id i17-20020a50fc11000000b0045a1bfa98bfmr32463414edr.413.1669340081086; Thu, 24 Nov 2022 17:34:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340081; cv=none; d=google.com; s=arc-20160816; b=zeKCy6OxDRJNkc3wQ7r5x2MnSqkgH/Zsg2Gk40j9METG5u+qGTmC7vcpLPVnV0fcKN HixfgR73I2KX9hzzVQp02Cwx/Q2D9reVtgYQp41Es+VozpXu3lOdOk/MVlkN4wLXxXD1 OLG55iHCuYy0x8jEA4pYMMgHLWom+NBATj5wIAe0d4Lmx8DZ+FTgEklhpN67Ew/DnzKC 2oZKjMkYa6tsxAFw7AVRvAsiI1WXqHHDF0dvdZijnnY5YtmOwknOrYpVOe+jOxeavN3S g1T2VtiKg2x1HQPCYSHQMtmH15lJwZBkcG2T6he1wQQ/xIyfKSVoH8UyqdpclGLpPQqA MRvw== 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=4D+7W5w7BU/Z0evSVZ3I6qZJGuL0zAZ86cX4hlu3MdI=; b=qRohfGREOVBgDZyBNB5hmz+woHmuBlaZLPVIA9gEKTqUmqlQBSE2vlwffIjz9oNcle GebCcwLMLvqjltpilQYkZsdrkkQ339y2CSIwzDO6ZZUX3Y6KtmwZfRcMXh2hYt6G3M9s BgL13mRYQ5QlYZU6Hg1qGCwbMJVsWFxDpfNbYLs9nmil38Jrf4yiBDZRgjNc3jdc+jWW dluyWuMvoRdlJqhlSd5L5V+CGlyot5JnfYHA6n507jpbv4ON+9T6HSuDqaoWOXOBkblt GMJzTaNOBfTxAV/VF7WD2Kpo5arXjNXT3NhAzyDK9leXFzVhXka5SEVe94NZE8D4iyN0 yoJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="eNFw561/"; 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 dp22-20020a170906c15600b007bc30c06aa2si1104004ejc.902.2022.11.24.17.34.40; Thu, 24 Nov 2022 17:34:41 -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="eNFw561/"; 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 5585B68BCA0; Fri, 25 Nov 2022 03:31:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F44368BC14 for ; Fri, 25 Nov 2022 03:31:13 +0200 (EET) Received: by mail-ed1-f51.google.com with SMTP id b8so4471276edf.11 for ; Thu, 24 Nov 2022 17:31:13 -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=dv7denKsRZZl7kriNX/Y4EePok5pV+nCCZwsOMM8mLw=; b=eNFw561/y2WTdcFZx88pxAomNQGoD7zvw5ILlzlyaDE79qzFHaXWLya1wW447HIxJb IfTZ1ZZgdRqw6IhNtpM5qNmhurbMWo93Zvq3h7Y5tuj8Bdv7rzU87E+TU9/B9TzLhsEk +bkaAt11nm7pkIXfxYsLONI4YL40tG94sReED4echM9cNw09OE9x3L0lTS+1tCI4ioe5 MU7GZd+LTAqJqWRyU4WgjtpT6jaPx+8V5nW8kCYj7bjk4zBHA95SOqeAo8giDtwb+pBM NI7hXyU8vQf2fOELdVub6uuNazrjruSAc2WgJPz33fbey+lbN7LKpPQYG7z22aKaUtwT B3Pw== 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=dv7denKsRZZl7kriNX/Y4EePok5pV+nCCZwsOMM8mLw=; b=Wo6h1o0aeQhZDwpO04He2+IXBeBYDb57ojalnfb/PEmvmojbNZLFRNkM6XkR6CvRjj w/kyLimvO/CCNBlcFLHS9oMkE6ltzgHnMDTRDy6ataIzqDmiVAzMze54gv6IDAoPyCod EOFFpVbHYNUKxAdF6wKu/421/UEDqsxgRzXiQXzpgvuGZEtKjmPR2b/aZ2qe4ckTGB+i ARtkYd29VF2IPMPGV4wz+xffRak0wQC0NVsRLIRQbGXtKIoVyKMIwIuTAOk9ALoSCsDg K7als80nb9n7U8ErBMcip+XFMhmK+O7L98yKsbjgG+fgYJaMhWZp87wmjl/DJgS4CaHz cqOA== X-Gm-Message-State: ANoB5pmV+mVUBSrrxMNiRFcXuPfEzwpiESpljVxSRvkG/9hb9kSngWcj oOFiKfyjCoejIfETwb/pBOBdiS4bL8I= X-Received: by 2002:a05:6402:3711:b0:461:b6a9:c5cb with SMTP id ek17-20020a056402371100b00461b6a9c5cbmr18091363edb.148.1669339872596; Thu, 24 Nov 2022 17:31:12 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:12 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:41 +0100 Message-Id: <20221125013046.40904-27-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 26/31] avformat/nutenc: 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: 5A3Rr3uOWwd4 --- libavformat/nutenc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 1afdeeb8ab..ff81ee34aa 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -516,7 +516,7 @@ static int add_info(AVIOContext *bc, const char *type, const char *value) static int write_globalinfo(NUTContext *nut, AVIOContext *bc) { AVFormatContext *s = nut->avf; - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; AVIOContext *dyn_bc; uint8_t *dyn_buf = NULL; int count = 0, dyn_size; @@ -525,7 +525,7 @@ static int write_globalinfo(NUTContext *nut, AVIOContext *bc) return ret; ff_standardize_creation_time(s); - while ((t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) + while ((t = av_dict_iterate(s->metadata, t))) count += add_info(dyn_bc, t->key, t->value); put_v(bc, 0); //stream_if_plus1 @@ -544,7 +544,7 @@ static int write_globalinfo(NUTContext *nut, AVIOContext *bc) static int write_streaminfo(NUTContext *nut, AVIOContext *bc, int stream_id) { AVFormatContext *s= nut->avf; AVStream* st = s->streams[stream_id]; - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; AVIOContext *dyn_bc; uint8_t *dyn_buf=NULL; int count=0, dyn_size, i; @@ -552,7 +552,7 @@ static int write_streaminfo(NUTContext *nut, AVIOContext *bc, int stream_id) { if (ret < 0) return ret; - while ((t = av_dict_get(st->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) + while ((t = av_dict_iterate(st->metadata, t))) count += add_info(dyn_bc, t->key, t->value); for (i=0; ff_nut_dispositions[i].flag; ++i) { if (st->disposition & ff_nut_dispositions[i].flag) @@ -587,7 +587,7 @@ static int write_chapter(NUTContext *nut, AVIOContext *bc, int id) { AVIOContext *dyn_bc; uint8_t *dyn_buf = NULL; - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; AVChapter *ch = nut->avf->chapters[id]; int ret, dyn_size, count = 0; @@ -600,7 +600,7 @@ static int write_chapter(NUTContext *nut, AVIOContext *bc, int id) put_tt(nut, nut->chapter[id].time_base, bc, ch->start); // chapter_start put_v(bc, ch->end - ch->start); // chapter_len - while ((t = av_dict_get(ch->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) + while ((t = av_dict_iterate(ch->metadata, t))) count += add_info(dyn_bc, t->key, t->value); put_v(bc, count);