From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C577744E79 for ; Sat, 26 Nov 2022 14:50:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ABFC968BBEE; Sat, 26 Nov 2022 16:47:30 +0200 (EET) 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-Google-Smtp-Source: AA0mqf5NM664N9PU5BlOy3xNXrKUYhhNtgQ5uKnBAEReR2TUmK3k7tT5mUHKso5cihGu5MJXrK6prg== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- 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); -- 2.37.0 (Apple Git-136) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".