From patchwork Sat Nov 26 14:46:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39481 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6219160pzb; Sat, 26 Nov 2022 06:50:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf5FX/IUcOuD76IgCpk0b26J58OhC5LSDdEKPpBy5VwTYRvRpC8n3j8P4qg7L+POyfayUU3C X-Received: by 2002:a17:906:c40d:b0:7af:1534:73c9 with SMTP id u13-20020a170906c40d00b007af153473c9mr20570787ejz.558.1669474242487; Sat, 26 Nov 2022 06:50:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474242; cv=none; d=google.com; s=arc-20160816; b=EQptrEtZbylQPGbhqQXfZorUzpU5t43iLxeUaD/b//9oNc+8TkoIMnUnN8lUmkucpN 5O4tWyGs92EYzv0hBLHC8nnFYrIKR9auztRkoKmDwhem7gmTI5J8NuVslYcvrIsjzn82 aMttLUOyTt4GJ9HiXX/4tFkblAhVCTHxXIciyHkbreG+ps3AKWZwlFDOwKQNds8QLVmS sDlm+p8modMhsTmi9q1jwWYZa7SUi8i3vA2DaOaFlXkt6RKGdyV0y1GjjsE+6p05Dm57 C4wJ9vReeDpXRXuy6tzHdWBBO5saS44BG79aMQ2HsAYj4E2muEDCwYMBvCeCJ2DuMOHX H2iA== 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=KOofi2WKPKJMAwX3OuQXzGOQu9J7rhqmBLe/VqyjzuHa+XjQ8GTYmaC5KoZFzbQgpo u7FOzRjF0xnT869cvCoxn8e8OpEaV2pjEDNfdhX1aK+c9I0X7yKS6IkwhW5DlcYDXPLG CNNEjacgjsXsfJob/vSYuJnoQVmqaY0t7ICkRn1kHw/CFtGCfEWQo21/NwJsXnwnM0XZ rV4PpXkokaRaTcEFQ9Be/poY01fqtSnrVzQViZShHojbJ7NZr3xCeO0JQH/vnerqNmV9 SK4q1v9lnrvla98DVG9Atup4x0RcF5PdAVZ/3weDpfscn9iJRzfmDmuIATUpsSCTJYZG oo+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=NoNrAx9F; 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 z12-20020a05640240cc00b0046800749660si7523436edb.207.2022.11.26.06.50.42; Sat, 26 Nov 2022 06:50:42 -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=NoNrAx9F; 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 DEB3768BCB0; Sat, 26 Nov 2022 16:47:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E85C68BBF0 for ; Sat, 26 Nov 2022 16:47:16 +0200 (EET) Received: by mail-ej1-f51.google.com with SMTP id td2so1982767ejc.5 for ; Sat, 26 Nov 2022 06:47:16 -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=NoNrAx9FPPRUzVOyE9iprPs6Ty1H4fa+/zBUDfNgPorEZfR3YL77eN8kYFU8TD0iI+ 1CJln5fL3nSP3AY35djr8Hul70ODOamqvv0mPNQ8nM0gfqztOmT9eGhgikkL2QZVJVEm rK8nwbGrcHoSsCjZ4Odvn+AxxLIZDGx7XB9s0dGADsdzVQ3n1/phhFs3QGVsLwpKlwwl nutKDZTpJ3c6fzPWKSZW+2FLYniQwxWm/gd9tf/PMuGTfi4cphBjVAozsXs6ZswqPFxl RjQTQBnjY4yb5xayM40k+XOzICt9uYuv/ZYis/HT7TMiJNX+o27Cx6zzPVChQtORyuBv DRrw== 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=o6qKHE7KVJ1dydeUtUdsBzxjOA+p+riTCksuoBBr+Ze3SraE2K3eobxGNHgbnlZOUL a2S0z9rfKCJh73ZyYnYuACWi6gm3gG+ky8DS/PIHavgv4tXQEQutd+Jsf1RksWpd4c0j 0R813oQstHrTFcdpGglqb6zstk6rodJUHMut5i0o6MCc29KjHJWsxdeUAKCXW9j7a1S8 9eL3QxIDXRuxgJZGXd7ihCqQYTylQulj2GHUKNRlRdTQVROsKO48pq3kIobMv5qfDqVD AiernrkG0OcO7VchhZ47AtTjP8ADjRXGRbOVaZCgqnnmOz0pjtryrIUUytqcmqW4IOOl ypjg== X-Gm-Message-State: ANoB5pnaxY7W8YeYRH10KoV3p6wfvpC2Ih6wJX962A74vTR3RV84kjrb gUN4SAEkhXcM56ahLaAnBm1rhrGi/zE= X-Received: by 2002:a17:906:a0d9:b0:78d:b912:6a6c with SMTP id bh25-20020a170906a0d900b0078db9126a6cmr37142414ejb.124.1669474036339; Sat, 26 Nov 2022 06:47:16 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:16 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:43 +0100 Message-Id: <20221126144648.73162-27-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 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: FfYyTeBCS4jv --- 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);