From patchwork Sat Nov 26 14:46:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39463 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6217234pzb; Sat, 26 Nov 2022 06:47:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf5JlSUPKC/jJ/5/hf+6zlJX3CDh6+UvCRvdEW/MRDbfQ57N7T3J9W/nMv5II76SN9J1lI1e X-Received: by 2002:a17:906:9d16:b0:7ae:c45b:98fb with SMTP id fn22-20020a1709069d1600b007aec45b98fbmr27007999ejc.478.1669474036641; Sat, 26 Nov 2022 06:47:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474036; cv=none; d=google.com; s=arc-20160816; b=fiBfGl6pW/EQLi7WXeBQuWpW7NGCAYQXQQOcLDm5YMmtF0GeLiGA4Q3r/p7/aukOBv aK+H2BOqV6fQGqx+21vry90ZpbxNdH2EVRQzQoV1iutyjy2QKlBsnF5ZRgQ7TW1Lu7P1 4ole6wfRhTcF9hOWPJE8q+oR4fHPZzgfPxv4pYXwW0a5hsrEf3v8zS+XlDOY+VmBigbN 8YHGLqjLEzT6CvJFo7fi+yQKH3390PWqkLBcTktsoQktBfxgAamWXCxGMrWiDS1UiBMu cdc1zANrIKTcQzVtJsYycTpX+f7Ja7qPN1C/+vUMAQmJjof4vG/bPYhQFrcAKBfFlG07 dAUg== 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=TuezInvmTMZkbqSkStvHMFlmfQWOM1D1sec0WkSAkdI=; b=LMYaDihJwz5BgfzxmMwYuKrKvR88pdVKsYkh7VYQJP2htuGQkwkg5CEpO0ub3uMwxH Ib9vn92n23uwrCTaD4BijG6Fe0BFZiCxZiZW9y2DOYeqG2zLx81LNcTCYTgWIzKms5yJ 6iPjhqE/w6x+wvOa9JpDMZ9XQn3w1j7Xm9PpkFUpPaReTjuDsl7db1f66+RkKSpA395d cSy+7gXi3+hULj4lBqn8Du6ToYrOl1DZQ/da240zMox2fqiSSf7BIdUJbGczicacFk84 9VFWVq7iaYfbcxWos3jj3exWQ7TJYtE/Wbk/YQAITnffHjK92LrPVTQN1tthXQ7aSL+W PlrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=iWga8p5N; 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 o14-20020a170906974e00b007ba9c086b05si8100076ejy.497.2022.11.26.06.47.16; Sat, 26 Nov 2022 06:47:16 -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=iWga8p5N; 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 085ED689993; Sat, 26 Nov 2022 16:47:06 +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 B08026801C8 for ; Sat, 26 Nov 2022 16:46:58 +0200 (EET) Received: by mail-ed1-f51.google.com with SMTP id b8so9867544edf.11 for ; Sat, 26 Nov 2022 06:46:58 -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=b8/VeIQO/Q42eL6WBDqBDXJKB0pDppmH7+CgbF4lHVY=; b=iWga8p5NbtvJQcxrOrvhDQjDJZZoiKwLavNB1WYkoVTrdM1asRe6eq6weIPDckWH2B c4uUEVbdjjLunnYFQa3I8QUn2ueAItBN8SBZmn6E9GXP7ddKY6+SelYGaUlmETQnvhy9 Zl1mu+60kl2gkL9FUDuSJFOcKTWrd4KL5gMKL/ZA1ZbFekZt+KwnJ8JieknRPMlSBF9+ tAjfW5HiOtJ8guBZLopPA6Padln4wBghPo0vwsHNFd8+jcTAkrULsxnjAvommSazy6a4 8E2RfOcWwdM4VqLnVlrUZw242I7QZl+9Fi+R1MvGsu0EH5tZA8ycZWnVA8ajBMTI3mzp dgGA== 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=b8/VeIQO/Q42eL6WBDqBDXJKB0pDppmH7+CgbF4lHVY=; b=2uWe77Xmwn3I7t99dS546w8Y9pX7dRvR77mUVlDHeouhPK4le6b4VNPusnrMfFftyX 4SBiICxIpKYXgjev+f7OIb6DBTj+4L5B4rlMRq9YLdTWJb6cSzqGGTB3Fk9u/Tiz57YB hMOuHuIn8nmYALLu40oEmy7ca/+7DrTzQSpPmEi1iAYSpIkm/IIN2DfL09neN9oThvDl d7E65HMabBH9Vkg1EkuPUJFZ/5HwOMG/3df7RgXExaYpY1ZDoJ+hE8dSs2k2tSZXYYNH Qjg2yanO+Ar3jBnoUkfPynt5D8mEPq14wcroJaL3rBn8pP39yhIx6ekGDNWWgBgn1sbd hL4Q== X-Gm-Message-State: ANoB5pmKtvI+f3roEdjadjtNTSFJjBfpvPHGovAnEFJ4ZN+t21ZNHwAW oK1N4g8qjcCVu+Z3jxKygicBSYWBBA8= X-Received: by 2002:a05:6402:1397:b0:467:78f2:d81f with SMTP id b23-20020a056402139700b0046778f2d81fmr23023487edv.88.1669474018164; Sat, 26 Nov 2022 06:46:58 -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.46.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:46:57 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:18 +0100 Message-Id: <20221126144648.73162-2-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 01/31] fftools: 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: gApSMRkBcbQC --- fftools/cmdutils.c | 2 +- fftools/ffmpeg.c | 2 +- fftools/ffmpeg_demux.c | 5 ++--- fftools/ffmpeg_filter.c | 3 +-- fftools/ffmpeg_opt.c | 2 +- fftools/ffplay.c | 4 ++-- fftools/ffprobe.c | 6 +++--- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index beef8ce385..a1de621d1c 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -921,7 +921,7 @@ AVDictionary *filter_codec_opts(AVDictionary *opts, enum AVCodecID codec_id, break; } - while (t = av_dict_get(opts, "", t, AV_DICT_IGNORE_SUFFIX)) { + while (t = av_dict_iterate(opts, t)) { const AVClass *priv_class; char *p = strchr(t->key, ':'); diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 3767ab444b..0aeb06e5d5 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -620,7 +620,7 @@ void remove_avoptions(AVDictionary **a, AVDictionary *b) { const AVDictionaryEntry *t = NULL; - while ((t = av_dict_get(b, "", t, AV_DICT_IGNORE_SUFFIX))) { + while ((t = av_dict_iterate(b, t))) { av_dict_set(a, t->key, NULL, AV_DICT_MATCH_CASE); } } diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 2ac1d795b2..e845e6784d 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -1082,13 +1082,12 @@ int ifile_open(const OptionsContext *o, const char *filename) unused_opts = strip_specifiers(o->g->codec_opts); for (i = 0; i < f->nb_streams; i++) { e = NULL; - while ((e = av_dict_get(f->streams[i]->decoder_opts, "", e, - AV_DICT_IGNORE_SUFFIX))) + while ((e = av_dict_iterate(f->streams[i]->decoder_opts, e))) av_dict_set(&unused_opts, e->key, NULL, 0); } e = NULL; - while ((e = av_dict_get(unused_opts, "", e, AV_DICT_IGNORE_SUFFIX))) { + while ((e = av_dict_iterate(unused_opts, e))) { const AVClass *class = avcodec_get_class(); const AVOption *option = av_opt_find(&class, e->key, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ); diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 5d50092b72..b0c4c8ece3 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -452,8 +452,7 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, snprintf(args, sizeof(args), "%d:%d", ofilter->width, ofilter->height); - while ((e = av_dict_get(ost->sws_dict, "", e, - AV_DICT_IGNORE_SUFFIX))) { + while ((e = av_dict_iterate(ost->sws_dict, e))) { av_strlcatf(args, sizeof(args), ":%s=%s", e->key, e->value); } diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index a9dcf0e088..3df02b7d7f 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -169,7 +169,7 @@ AVDictionary *strip_specifiers(const AVDictionary *dict) const AVDictionaryEntry *e = NULL; AVDictionary *ret = NULL; - while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) { + while ((e = av_dict_iterate(dict, e))) { char *p = strchr(e->key, ':'); if (p) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index bcc00afe31..fc7e1c2fb1 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -1860,7 +1860,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c } pix_fmts[nb_pix_fmts] = AV_PIX_FMT_NONE; - while ((e = av_dict_get(sws_dict, "", e, AV_DICT_IGNORE_SUFFIX))) { + while ((e = av_dict_iterate(sws_dict, e))) { if (!strcmp(e->key, "sws_flags")) { av_strlcatf(sws_flags_str, sizeof(sws_flags_str), "%s=%s:", "flags", e->value); } else @@ -1966,7 +1966,7 @@ static int configure_audio_filters(VideoState *is, const char *afilters, int for av_bprint_init(&bp, 0, AV_BPRINT_SIZE_AUTOMATIC); - while ((e = av_dict_get(swr_opts, "", e, AV_DICT_IGNORE_SUFFIX))) + while ((e = av_dict_iterate(swr_opts, e))) av_strlcatf(aresample_swr_opts, sizeof(aresample_swr_opts), "%s=%s:", e->key, e->value); if (strlen(aresample_swr_opts)) aresample_swr_opts[strlen(aresample_swr_opts)-1] = '\0'; diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index f46925618c..d2f126d9d6 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -656,7 +656,7 @@ static int writer_open(WriterContext **wctx, const Writer *writer, const char *a goto fail; } - while ((opt = av_dict_get(opts, "", opt, AV_DICT_IGNORE_SUFFIX))) { + while ((opt = av_dict_iterate(opts, opt))) { if ((ret = av_opt_set(*wctx, opt->key, opt->value, AV_OPT_SEARCH_CHILDREN)) < 0) { av_log(*wctx, AV_LOG_ERROR, "Failed to set option '%s' with value '%s' provided to writer context\n", opt->key, opt->value); @@ -1945,7 +1945,7 @@ static inline int show_tags(WriterContext *w, AVDictionary *tags, int section_id return 0; writer_print_section_header(w, section_id); - while ((tag = av_dict_get(tags, "", tag, AV_DICT_IGNORE_SUFFIX))) { + while ((tag = av_dict_iterate(tags, tag))) { if ((ret = print_str_validate(tag->key, tag->value)) < 0) break; } @@ -3315,7 +3315,7 @@ static int open_input_file(InputFile *ifile, const char *filename, ifile->fmt_ctx = fmt_ctx; if (scan_all_pmts_set) av_dict_set(&format_opts, "scan_all_pmts", NULL, AV_DICT_MATCH_CASE); - while ((t = av_dict_get(format_opts, "", t, AV_DICT_IGNORE_SUFFIX))) + while ((t = av_dict_iterate(format_opts, t))) av_log(NULL, AV_LOG_WARNING, "Option %s skipped - not known to demuxer.\n", t->key); if (find_stream_info) { From patchwork Sat Nov 26 14:46:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39464 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6217329pzb; Sat, 26 Nov 2022 06:47:25 -0800 (PST) X-Google-Smtp-Source: AA0mqf7ZjlBW8DnuasgoOY6IOindqPvg+7pFlb3UgSpM+USyzjOn5XVNQtTanRTmL3MPFIg0HMCu X-Received: by 2002:a17:906:597:b0:7a8:fd1a:c073 with SMTP id 23-20020a170906059700b007a8fd1ac073mr28615326ejn.4.1669474045528; Sat, 26 Nov 2022 06:47:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474045; cv=none; d=google.com; s=arc-20160816; b=ZZYflXAFqpt8vJQSl3mi59X00Hvs4qt2JqmcMABj0xqqOKFAjOhG6cYR/vwS0JFvHN dluCJmoDmeUWYmPAg8eUPmlgvreDDkI3hgYAAeXSCeUpYGOkOii8OdInZolR5ScFOdDJ fzrQ6Fj4b5L1VlsvWnE0MUQJWA5ZHvxiiXcgdNS75eo+pBLBc4zR+QjZLodKRHM4Nwxf kMqjQXGxaQmFs4OSliwy+XHPbFm3WEJ0V4DiUIeGWMAHjwzHtXK6xJzQ9A0uPDFYUlZW JvhSlkFfrbchi/E1f3bLJuwzKHuAfcuN4H1PCdSsBd7XBbLWuoQyu58IblfsTpSRmTH7 9ssA== 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=m7O/s//LStl2f6GZHSO8d3nCQKedPErrenwNJTNA3vg=; b=K0ucGcJLKNjpVU3ROC9DQ5LhLIjytRpek/FEtckFqSEQBQnBOG3w8BhF2UXrVD8Scw qs6bMAHCJ3OGGSeLJBpuPYdZYwwN43EMiK/ITdtNqbp6+pvC8kpN6l/NH9CfzxnsuhnK N+k5ZWlh4yQ/Sv4Boz/xXgBowmy/ZYK7n4P/+BCL4wARuUpfRfuOFLAJVkhP/OzQ97oD tnbPDZoVElmRSzvotVQIAIc8/OLBDYOeCvWiPsu1/R48DqEDzZl09nzZlZK2+fnutNE0 aqm2LCukN+Lrhvr8XmmFthkIpN1cdlVCpyUgm4hOLMtLzdi1ilA5DFSrP5yXt+qVXX9e koQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=JRHr41dM; 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 f7-20020a056402194700b004571a669230si5446149edz.469.2022.11.26.06.47.25; Sat, 26 Nov 2022 06:47:25 -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=JRHr41dM; 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 F230C68BA90; Sat, 26 Nov 2022 16:47:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D4AA689CFA for ; Sat, 26 Nov 2022 16:46:59 +0200 (EET) Received: by mail-ed1-f45.google.com with SMTP id f7so9890467edc.6 for ; Sat, 26 Nov 2022 06:46:59 -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=sbyqKG1+aibNFqpFeo5PrPnYbHRtnS2su5FPnEkQkYQ=; b=JRHr41dMNPmnP8ezAVV5xft2eGCDQ0pNTap8h1r56b5Vz4TwSUIPA9oVuXWdTDu2oI XZeSdI9kIGQwJGdal6pq3YDhymp/OacKxriOjCQeKVUsiuneYQfiAcijo9WFsM8rIyKi Z0Vy6xideiNc9GOrRKraad7v2IpMSEV7/xPxYzC+n3OOXAZKi3ZzBKu7dON/cAedrz1l wwk/l3QcswiTpJ4QgPxg0AS8m9ORtYmwTUE78Q0a7T0JwipW8/PsqKLOM4oWpVLWepL7 N1Rn1wGooavEC+/+zMs/2O3DiA9pYaeQdBDWfpV0yUj1k/BmtUH1hG4NyaEx+w4b534V UBcg== 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=sbyqKG1+aibNFqpFeo5PrPnYbHRtnS2su5FPnEkQkYQ=; b=ba7z6ZsMpAYuOhy6g/QtfK3fJHwcLRBZm5MsFPXmVHZ5iMOIdorSLC49DiyQ3CCe/a 5CrnSbhhDLA+jijgjiCAcrsGqNkshNsGo2hNaFKrwWoHNUo/kQDF7IqGBvxDExtLpWCm Fl7S/mszsLS1Kogq6Q29pYH0z9IsteU8RvnlQBIiFNWr3yzu1AfKBpiViMfLPCW1J4Sg mOV7IJcy817HbTQySnxUHIAGuc2tf9NjiKkjZAcNaZvzLku9rgnwEMm08qRm98zCd5uH x4m+H1zgNo3Xw4MZ2G9eRGuUkZ6wKtJRLoCTqztXEpAScMnuqJSvzrLzcsUSl1P934i/ jkqQ== X-Gm-Message-State: ANoB5pk4Zv40g8CmAQtFYnXQVKOw8dHuOxZIXA+/8PoajBySmei4P9O3 Vwe3XdUJ5fwZo7UOCEMEMw3xIL/LWm4= X-Received: by 2002:a05:6402:691:b0:46b:c11:9f59 with SMTP id f17-20020a056402069100b0046b0c119f59mr427977edy.407.1669474018991; Sat, 26 Nov 2022 06:46:58 -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.46.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:46:58 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:19 +0100 Message-Id: <20221126144648.73162-3-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 02/31] fftools: use av_dict_get_string 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: GnTR5Qc+R2fa Instead of manually assembling the string, use av_dict_get_string which handles things like proper escaping too (even though it is not yet needed here). --- fftools/ffmpeg_filter.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index b0c4c8ece3..7eb656dbe5 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -972,39 +972,34 @@ int configure_filtergraph(FilterGraph *fg) if (simple) { OutputStream *ost = fg->outputs[0]->ost; - char args[512]; - const AVDictionaryEntry *e = NULL; if (filter_nbthreads) { ret = av_opt_set(fg->graph, "threads", filter_nbthreads, 0); if (ret < 0) goto fail; } else { + const AVDictionaryEntry *e = NULL; e = av_dict_get(ost->encoder_opts, "threads", NULL, 0); if (e) av_opt_set(fg->graph, "threads", e->value, 0); } - args[0] = 0; - e = NULL; - while ((e = av_dict_get(ost->sws_dict, "", e, - AV_DICT_IGNORE_SUFFIX))) { - av_strlcatf(args, sizeof(args), "%s=%s:", e->key, e->value); - } - if (strlen(args)) { - args[strlen(args)-1] = 0; - fg->graph->scale_sws_opts = av_strdup(args); + if (av_dict_count(ost->sws_dict)) { + ret = av_dict_get_string(ost->sws_dict, + &fg->graph->scale_sws_opts, + '=', ':'); + if (ret < 0) + goto fail; } - args[0] = 0; - e = NULL; - while ((e = av_dict_get(ost->swr_opts, "", e, - AV_DICT_IGNORE_SUFFIX))) { - av_strlcatf(args, sizeof(args), "%s=%s:", e->key, e->value); + if (av_dict_count(ost->swr_opts)) { + char *args; + ret = av_dict_get_string(ost->swr_opts, &args, '=', ':'); + if (ret < 0) + goto fail; + av_opt_set(fg->graph, "aresample_swr_opts", args, 0); + av_free(args); } - if (strlen(args)) - args[strlen(args)-1] = 0; - av_opt_set(fg->graph, "aresample_swr_opts", args, 0); } else { fg->graph->nb_threads = filter_complex_nbthreads; } From patchwork Sat Nov 26 14:46:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39465 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6217412pzb; Sat, 26 Nov 2022 06:47:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf58oUcy/FLCfb4P38Lus+GS75knp3tNxyQ1kc3oHTe9DENX3Qj6MVbX3OjPIPtbDzxb0Cqs X-Received: by 2002:a17:906:a259:b0:7ad:ccae:a30d with SMTP id bi25-20020a170906a25900b007adccaea30dmr21689423ejb.704.1669474054581; Sat, 26 Nov 2022 06:47:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474054; cv=none; d=google.com; s=arc-20160816; b=rhGCeeMS1noGYRvxaSi9j+wu0oT4MJ2H68vblecuV4Wbwj2EkIzrf2DysXKDGpHrJs kE2+XfSqa3hsrSU0krNSuaXIh80EgZel0D77v2VTyoJACjJHU8xMkFFGecIqEFqbkN6n fQmHer4oYuk7UNlSRNgAEmYvLqdhYn0uFJ6nKDaLpPkONhADaKg8T4M+SrReNic87jLy RA0ktwE6baTkSrjnlTQ/EnsvcEKJWPtfwbREcXphcG5dI8wzsw/lHspzX7/giiDu/u7X QImHq7F0BXno1d9d3zI1r3xBWxfmverQZOh2+htEP8BKMPRh9YTiqdkCnxOBRamWrErY ebLg== 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=EcjBARgTZI1Lbw/VaSrjKCdBWHJO9AUpd/LmleczBpA=; b=qHgsKISjbnj7t6eI+3cfe/V+FHPF72MHuSBSAkONhpVa4lGDoFX/PAW+OOMEOKplFd 09ocHEnlL5yZ6ppz3O1pwj1krLj2/3cYVs8g47YeQeb2qiCwbpdx9tlT1FtiVNiIpLdK bhp6bAGVwR2NUB6NGyY53nNChemjL61lBXkDpbkngBXR7rWNrr+oq/f2WfVpqXbnKtMD 2V4M+ZYHEhik+7rz8WAPO157+4wgQqt34E0SwXb3MGJUqwZxiOAL7Lfrwy99j1uyxk4x P1e9hMv1jDDjecLxA5kgUQEP/i1jS3kTVPi9NDghzbwqrRjFrroq+9boBum0b4nsdPG0 JsRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=W75gNhMv; 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 hs19-20020a1709073e9300b007ae743c61efsi6799286ejc.1002.2022.11.26.06.47.34; Sat, 26 Nov 2022 06:47:34 -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=W75gNhMv; 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 F1EDA689D28; Sat, 26 Nov 2022 16:47:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51CCF68B9A9 for ; Sat, 26 Nov 2022 16:47:00 +0200 (EET) Received: by mail-ed1-f43.google.com with SMTP id f7so9890485edc.6 for ; Sat, 26 Nov 2022 06:47:00 -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=MoULvAcSqQiLnchfXr21d4eDTgr9LCvv9U3HJ/vs014=; b=W75gNhMvyYAOLby6Iv7ddO7Bj49lXhlRJolABMjYzIcA+Xm1SnbyXKF5qqVaVa0/8B r0CAvqe8pPSknBPNAIbTik9V74ze8xziIQXBsArmfb+DZyM09wXSHNvanRfEhKwLLG+E kuspEL6NIIeYr8BFt1UJmAzHNhwKbS/BkuV5XCJ/6cx0xp6gOT2WmO2vKpIzZXZZUdQT kKbFy0pBN8QD0EwshCNTF6emc7isPJW1An0vO8YiJhvovB5jaaX+Z60Bj7kq7IWafdu4 3QO11GHZ7yIA0E4+inSoxkXqurMQ7jeljlTRzNz2Ya0ns3pJCF/PeOIHlmJytLjfg6kG 7KiQ== 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=MoULvAcSqQiLnchfXr21d4eDTgr9LCvv9U3HJ/vs014=; b=LSmoIuQHrGfr/WWRxhnU1E2jBgVdj9XYus5UTACcU+F9iMugHRAkP+BEG29huERVTE 3lyxwNcVL7E3s1HystLlLZV78uJJgoVByIFxUENr18DDFET50b4NWAb93+INfEx9J6rF VrTHezMmyLEQUqy79nzQMWvFWv3YPvhyiVXpw5v606p14Qs4LOx8CmjvTYoekTGlWLhQ 5oIn8MkR6SegdkI+mwHaQsf6hPW+/3jmzmgzOrArPHTXioauHMnRUnbRzmyI3yitA6q/ tHX85R5A4/Gij1EOKpammTQEeAAfaaQi3o7lXn4oM1/2HJSJjoRToKy366db0OEVMuSC 26mg== X-Gm-Message-State: ANoB5pnv6bT7Dx4BUOO1fFW9rxgCXqukxxRfnRHbz0oIqrOulgvXgUCQ McXJbrPX7I9CH2s9WynWwAP3Zfi7vrk= X-Received: by 2002:a05:6402:380b:b0:462:7b99:d3b2 with SMTP id es11-20020a056402380b00b004627b99d3b2mr10565381edb.248.1669474019787; Sat, 26 Nov 2022 06:46:59 -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.46.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:46:59 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:20 +0100 Message-Id: <20221126144648.73162-4-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 03/31] avcodec/librav1e: 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: mLUvNXzMwRtm --- libavcodec/librav1e.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/librav1e.c b/libavcodec/librav1e.c index 4f424caf5b..f48d5e0eb4 100644 --- a/libavcodec/librav1e.c +++ b/libavcodec/librav1e.c @@ -243,8 +243,8 @@ static av_cold int librav1e_encode_init(AVCodecContext *avctx) } { - AVDictionaryEntry *en = NULL; - while ((en = av_dict_get(ctx->rav1e_opts, "", en, AV_DICT_IGNORE_SUFFIX))) { + const AVDictionaryEntry *en = NULL; + while ((en = av_dict_iterate(ctx->rav1e_opts, en))) { int parse_ret = rav1e_config_parse(cfg, en->key, en->value); if (parse_ret < 0) av_log(avctx, AV_LOG_WARNING, "Invalid value for %s: %s.\n", en->key, en->value); From patchwork Sat Nov 26 14:46:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39466 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6217478pzb; Sat, 26 Nov 2022 06:47:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf4E4kiYj+qWEjSCjwgJEaeOk7xcn9ezOF9t/T4S8RNwy61KwNr1sdAh7jHK/68akWF7y0Mk X-Received: by 2002:a17:906:190d:b0:7bd:1f71:ee0e with SMTP id a13-20020a170906190d00b007bd1f71ee0emr5650879eje.714.1669474062593; Sat, 26 Nov 2022 06:47:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474062; cv=none; d=google.com; s=arc-20160816; b=FqCLLKJoprOl3QG8WtiNW0MckanBdU5W0Qvs/0in58ScrtC9/AiFCKiPLeJtuyffAv NONl0Wk3PZnHQOM1qSjxwj/5biOX/Mrds5XaViC75dEA8w5r+guohWN+Orv6bkzUiyhO i0Gf04UaGQmCTlVjGfYImxUM0+n0YYgTuuAsgpjdeFEzZF71u2RjJB1PKkZRELXKi5hJ HZcxMdKjtYhu4Lq89b21WoIRLAv67t9n9Ror6USVPD072Erc3X8Mz8JVKeg1znoKFIgr ahdc3cytm912fqXEy+0ASlctdEUvwzVzXEEYWWje9Sg/Ep278KauocoNA1mXpy/yUfjN X7BA== 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=n8ei5KAM8J9Yyah7adCkvkTx+eMS3oI/it5Evocqo0A=; b=kNTpzkjWOAZrx7k6FXKYXfpRV/2VxORrLLG178HbNm6SJwkGdLcLKfXzYb/g6WIgc/ 4G/bm1QpRtUFa9N431IJYIBBC1tn1BEafrD4sRCXT6Cc/g8nnY0pehw+n2CnYwb66ojO mr1zVO5t1thKTh7ggTK25brEIAxnBDWCklQhLmPJ9jCKzeh5JZL4IBg0h+FeQjXLMnKU ic3J+hg102j9EsSRfUIGTcDUunraeQedUY//JMi0W+6rgpmA1/iOAbhFRaPejHk/Ocg8 +N5nlR8ooYoV5wlr0c3HRM7VB7evnbR2nhf+o19eFntWK1mbtHKqOQQiUTuEHXTLLzLm RyfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=GXpym6kk; 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 go18-20020a1709070d9200b0078de536a3cdsi6167766ejc.119.2022.11.26.06.47.42; Sat, 26 Nov 2022 06:47: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=GXpym6kk; 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 DD06468BB30; Sat, 26 Nov 2022 16:47:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 35D3968B9DC for ; Sat, 26 Nov 2022 16:47:01 +0200 (EET) Received: by mail-ed1-f54.google.com with SMTP id z18so9861089edb.9 for ; Sat, 26 Nov 2022 06:47:01 -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=49Hlm+MT2X6vzU7RImTPCKswEJGotGgbioChgFcspIM=; b=GXpym6kkQEoEvVIr+8ADpt5vQQC6yQOUoJgvqlbYmAgfHUVbNIXpUHWwJseO8CcHt0 1PjxZbSAmGXr0q1Y0b2UeiEGZsT0mlid8IAb0U6zLKS6JCsnCKqrZoU7dexVk/eRvztA Is1LxpFOkolN1oiNlr7u/1om2Y1DIG0MgK8YyDqpyEP1pbkjRnw46Di68AkMKTxuBNFO b1O6Is2H6JuB4mDESasUnsFxoEnrpOD993/IhCfL1QTpeMkdK5Mbrb28+li+ku01SLdg ThSFQJDnJ/xhA8wIQ3rB2YRJlix7OCHyygF+opdp9euOAVZQ2u30qeHnENp6kwC1AOFk aS4Q== 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=49Hlm+MT2X6vzU7RImTPCKswEJGotGgbioChgFcspIM=; b=iZNnxtGaF2ouxTiaITpY9NLigY89lo6xTSKMYnexcjLzdHMXaRE0bpomT+YRZXzdWc 7QNTtQ61oRuFqIpAQpFoHnB86rzTOpjsPkxBWkKspzK2uwXB7dgC3SYVC9HGdJkIwxIs iuslM8ZjAxYFPGPR1dW172N+JOXTscW1+EJ7epmAGai50SP5HoWcfY89Lj/A1DIiJqs1 Hq3H5jMBrfqzn4pltUPIMB5c9QNcBY/6D4wRWRNYno/pFlXp4UMhxCHfAcOVBPbmObmr 7d+0wKFl4v5dV7WpxVXBF1dHFkiZtWfgIbr7AQC8TRlKNRt+TBu0xBOnsk10L+kZWS2A wQ2A== X-Gm-Message-State: ANoB5pmhMciO07XOAF8bnVIx34XkXwKLpLmUaYTzBu4uFWnRWmmv88Hb pGje4AMO8VzPFbMTUN45iZYatXbZ0mw= X-Received: by 2002:aa7:c042:0:b0:462:2f5a:8618 with SMTP id k2-20020aa7c042000000b004622f5a8618mr40544670edo.42.1669474020666; Sat, 26 Nov 2022 06:47:00 -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.46.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:00 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:21 +0100 Message-Id: <20221126144648.73162-5-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 04/31] avcodec/librav1e: remove unnecessary variable 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: 2WWULI+iaonj --- libavcodec/librav1e.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/librav1e.c b/libavcodec/librav1e.c index f48d5e0eb4..3481b7637d 100644 --- a/libavcodec/librav1e.c +++ b/libavcodec/librav1e.c @@ -245,8 +245,7 @@ static av_cold int librav1e_encode_init(AVCodecContext *avctx) { const AVDictionaryEntry *en = NULL; while ((en = av_dict_iterate(ctx->rav1e_opts, en))) { - int parse_ret = rav1e_config_parse(cfg, en->key, en->value); - if (parse_ret < 0) + if (rav1e_config_parse(cfg, en->key, en->value) < 0) av_log(avctx, AV_LOG_WARNING, "Invalid value for %s: %s.\n", en->key, en->value); } } From patchwork Sat Nov 26 14:46:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39467 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6217573pzb; Sat, 26 Nov 2022 06:47:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf6Ra6WOYT+k+Fl6QkjZ08BuJTy+dVzUVEHRLq2VFHXqjyOMuDq868N5rDCnIbeIkz7Rii+Y X-Received: by 2002:a17:906:480f:b0:7ae:967a:50bb with SMTP id w15-20020a170906480f00b007ae967a50bbmr25940422ejq.383.1669474070521; Sat, 26 Nov 2022 06:47:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474070; cv=none; d=google.com; s=arc-20160816; b=s44ISuoEzcKY++rMJNqLAdwlRroaC9VrlmIhVlJhYeIXv6GJNUnytd7wZtxIrdKtVQ 99768xQ51gOVufN9fU/xIZs7j4ZSwjdhMM6CE5OafpjDD1TtH/OicKRnwuQr3kiyqavz 7d4zTLryKfpCDkEIwo+6l4oZx1ZmRQ0f/E13Y5G5qJCPnizTUwnZiqJbOrEikLTLd9rm PUsbdLkRHr+336PV+uewdg0LHYxMxmgojLpSBA6Gk2HeDSgEtFs4nwRveEEA4YijoQni dk3tvZ5RMQZPe6E6l/phewdsCgNzWwxSFeT8Y+hTddkTae2OLDE2di1j6mXK6qhJU2sS gGPA== 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=21OBvDKstfZ5QIGONlR6S1ruWC3tO8bive2cQDAk0XM=; b=C99Eu2wN16rG2a5QP5JKSSF3bTh1FXov+bgcVe3mSwjF/Vvmuv5R7kbgKO9uAL9dS1 XWCskAyEAvuaFCJ5+rFxXqlaj7Aqm4CnMLs1RVfQFI67LmeJ/x1w++ljgyhen9VCvlxM LlsbqFC8xDIpnJ4CubeVXQwmgVhrRb97J1VUjlAuY/OT1idtYS5Mpm4CAF2yAn8IaySv TAy8XQmiq+IEKer3v3gpy1hoOYRfu+2f9RfXPtHMBcSL97QLvuc3X2PUOqjGWOWkWzvt qRt8h284toPW1V5dKbHw/GMozFzhL4OykjSg/fwDeuLdjSJhiC+VztxcQugWslVbgtqD 7Jew== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=IpSvXdTm; 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 qa41-20020a17090786a900b007771bc8dbb4si6240841ejc.781.2022.11.26.06.47.50; Sat, 26 Nov 2022 06:47:50 -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=IpSvXdTm; 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 EFD1368BA2D; Sat, 26 Nov 2022 16:47:09 +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 CE5E868BA7C for ; Sat, 26 Nov 2022 16:47:01 +0200 (EET) Received: by mail-ed1-f51.google.com with SMTP id l11so9909856edb.4 for ; Sat, 26 Nov 2022 06:47:01 -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=hBnHcMfD5KPPGlUk2ibwH8N2TevYX2nZcc6lbfzumks=; b=IpSvXdTm9UArCLvLh4km+ZuAYZ7qB/IZsmjkb6l5y/bptKQ7pM0CR6tU+2nJGxPYfJ E7U0gMvNrRpKczunr/bdydw0UfK0I6gVJbLhAkXtH61AliGVVx5UqB2hdCfM7JIqb7qy 6yu+XKKw1SezgYgagl9n8msLIH4OOLAXo+IFnJvYcIqFptPYMCa7CKESvc4EIPEYrmPV uwsl+Zd/LVlR2N9QB8czPRDGEyJcN1eRpAUe5ffOf/A7aNg5zIjcONKaV4ze9f9owLPg QdGLu0xCQKfXd7LtSsCAAYcfqRmj/dlzOTF3MeP5QeGuii7oWEr+B0LzC6uTMFbDJeeW zgug== 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=hBnHcMfD5KPPGlUk2ibwH8N2TevYX2nZcc6lbfzumks=; b=XuuDpxXrx3dDe9ZlyfXrbMbDEsz2StXOfv2H7AZ/ZLXxRXmPRlRA69U9rjvrUVCDBx 2JXf8eOwyPFgIzlP1mqZNHmdyMvbPLkfRmp1w4Ics1mrtT1Esspx3pRocfOA6QRL1eWq Pcvh4WUyLtQ9Oyx3yJ3kyXzeeiiM4uuDpDOW5FGixOA88+NVB1UJsrTcl/omzqep82eq DiOxOi7zYmEVjWba5QL8KOAF4cBSGX9EOS14OsPPfBu5RUjNl5IEGpe0DUbNhIWnUVWC /Rd+0ZswVfxrsnzJZP+bLgn5lZCXs4nbEKi8sFzFcHt8uOCP2NRnzvpQwmI1TisqVTL8 w2Xw== X-Gm-Message-State: ANoB5pnPELUXt0MYWh6AHBIMV5XPlhAVuGTWpexuMGdSaqj2FsPR01hE pIhzhc9ITCZKG3jbT316OzVH8bDJOD0= X-Received: by 2002:aa7:cd99:0:b0:462:719:3372 with SMTP id x25-20020aa7cd99000000b0046207193372mr40722109edv.361.1669474021377; Sat, 26 Nov 2022 06:47:01 -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.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:01 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:22 +0100 Message-Id: <20221126144648.73162-6-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 05/31] avcodec/libvpxenc: 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: ItMYXjwqHv36 --- libavcodec/libvpxenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 667cffc200..9aa5510c28 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -900,7 +900,7 @@ static av_cold int vpx_init(AVCodecContext *avctx, vpx_codec_caps_t codec_caps = vpx_codec_get_caps(iface); vpx_svc_extra_cfg_t svc_params; #endif - AVDictionaryEntry* en = NULL; + const AVDictionaryEntry* en = NULL; av_log(avctx, AV_LOG_INFO, "%s\n", vpx_codec_version_str()); av_log(avctx, AV_LOG_VERBOSE, "%s\n", vpx_codec_build_config()); @@ -1072,7 +1072,7 @@ static av_cold int vpx_init(AVCodecContext *avctx, enccfg.g_error_resilient = ctx->error_resilient || ctx->flags & VP8F_ERROR_RESILIENT; - while ((en = av_dict_get(ctx->vpx_ts_parameters, "", en, AV_DICT_IGNORE_SUFFIX))) { + while ((en = av_dict_iterate(ctx->vpx_ts_parameters, en))) { if (vpx_ts_param_parse(ctx, &enccfg, en->key, en->value, avctx->codec_id) < 0) av_log(avctx, AV_LOG_WARNING, "Error parsing option '%s = %s'.\n", From patchwork Sat Nov 26 14:46:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39469 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6217698pzb; Sat, 26 Nov 2022 06:48:06 -0800 (PST) X-Google-Smtp-Source: AA0mqf5sILpLBqS/YtqijixcoPfNFjDApdq4Fn+oGt8bcHVYUAe6TC92Jl7CAbyAhbOqYTZs/E+q X-Received: by 2002:a05:6402:5d5:b0:464:fa1:9ece with SMTP id n21-20020a05640205d500b004640fa19ecemr15428897edx.262.1669474086392; Sat, 26 Nov 2022 06:48:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474086; cv=none; d=google.com; s=arc-20160816; b=EbpfMg3acTWnQ74TH5pm/Ua0Bkt3x6yIeyuUXVz3a7i3t7tmzYIC75JF3JGn7vz1PN qKb6GOk1ryD94uzdbwNHP1VIA0f3GUARiVAjuAlFaz4bOPARZ9ptzBDYlp7j0euMenm6 23WGqDyff0xF1iPnO5Bg35iby6EHfFsY3e1kct0V6T1AYZlH2o26SYYN8CeSeIg+PzqT aBBGAQ03HI2ZZH0IW+VKymendoRdnyiBMisAqg5Be6fJweanCXmjroxDLZ2NnSZFSbw7 t676umPl3I+esNapM+PtYXR5/T1k1k7O46XsVxZ9q64JKabNBbSLYc4F1mfoCsf6zVyD r4qg== 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=oGc1Zgx9xhTWB2wlcoJq+5obdzF67pXvd98v7yk20vc=; b=XR7pyYdan0LERYBsLqa5+RGWsw8dmIzo/hvEa8ptNMc8zPWtof1objxYOelcjQYI9i 6n+8hqeR5lmUA5uRxFChbA3XzoNTPG0cxIdtbsPZoWl4di6y29FHjDasb1NDA+2lzXst GAISTrJPZ3DrFqcLfMEIu8tcOopaV6aQpJzzveZMco5jHwuuW4GympydokbY6C+pt2w0 jVJPUgkl04RIXK1aiNqEGWGW57BJ0Hm5nZEkMPLKXeh3Qf4AZkYVdVEc2Q580UNNAB8E Wvg+J2bKyCuAS+MXWeEt+Lxk3V0Tl8WPp/cJ4p2YvB/TVtEKm1O8a9rZoHGaK832qZWt P/UA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=WNMo2nAc; 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 ev15-20020a056402540f00b0046af8e07ba5si844100edb.295.2022.11.26.06.48.06; Sat, 26 Nov 2022 06:48:06 -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=WNMo2nAc; 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 0B7E568BB94; Sat, 26 Nov 2022 16:47:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F49068BA32 for ; Sat, 26 Nov 2022 16:47:02 +0200 (EET) Received: by mail-ed1-f41.google.com with SMTP id s5so9846696edc.12 for ; Sat, 26 Nov 2022 06:47:02 -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=GQEYXzXlGKCUgCZFejYqkRTvuuf17L8X93OdjULbxm8=; b=WNMo2nAcf6fSBcADbt+HEQ8rQAC6Cbh4u7+In10Wg4ejhOjug6AI+qXmrSMHP4fytO IOsfhde/QoeZ3+dYENLUzKofgB6X+Dxw6HyPvLOBzsN8WmBMOEDGXVzNmdWOCGmmXovk /ylRar2XWpa3P50D6wlxwupa/BW9DM3zncrrYCkRu28RDst3/rvfYkb9k4lJXf1bkcLV D7ptq0L0Z++s+oPVAdBlGTSZfPmxse/efFvldUH6PY5bssOL52CZryVwQFONKqNrKmut k9R6XYQAcGFjlUslWulKNDD/dHdWYIKIEy52HfePaV0SXdmHCp6jcJrvlmtQxwu+9Rhj 2mSg== 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=GQEYXzXlGKCUgCZFejYqkRTvuuf17L8X93OdjULbxm8=; b=BklSaP7/mJdTRKbF90qEUI/teMKhZeTdpymaCTz6iDQPlTZbEI+XNyonT6AlFUfbXb Gyj0HlweNRINAQTLIaxmaKHNn2w3+O9Imv8OZDdb1A2cMYSfZtrZmTNYvYAsyx4w2w4H TG3zYfNTxKx5A9u6prOl3NK7m0ACdRQP9F69rBwFPx+g8SoAZnjObLAbd85gylICjckQ qj0yuXkPfahvGA/RM+JTh/AY43lMwwoW2rh/rBnyMaYTHrXQz3mtmu/MhsqCH6e0q//v 7QNBbk3w6rEHT1lFrtWoI3Le4csl6gjRxL15x7jy2buP+InNZ8joQC60fE4h5Zvygw3w vIhw== X-Gm-Message-State: ANoB5pmy4PfIW3wCJnZHpBjpsbHe20JC9upA+v4eO55OgA2PxUwyZGAj DyFtqHT/Xdx2/sZU+ECJ/mfTh6e7KwQ= X-Received: by 2002:aa7:c50b:0:b0:469:d36e:3213 with SMTP id o11-20020aa7c50b000000b00469d36e3213mr24081291edq.206.1669474022077; Sat, 26 Nov 2022 06:47:02 -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.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:01 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:23 +0100 Message-Id: <20221126144648.73162-7-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 06/31] avformat/smjpegenc: 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: 4cHBJgE+ebRY --- libavformat/smjpegenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/smjpegenc.c b/libavformat/smjpegenc.c index 888ece2f7c..edba08cf9b 100644 --- a/libavformat/smjpegenc.c +++ b/libavformat/smjpegenc.c @@ -35,7 +35,7 @@ typedef struct SMJPEGMuxContext { static int smjpeg_write_header(AVFormatContext *s) { - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; AVIOContext *pb = s->pb; int n, tag; @@ -48,7 +48,7 @@ static int smjpeg_write_header(AVFormatContext *s) avio_wb32(pb, 0); 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))) { avio_wl32(pb, SMJPEG_TXT); avio_wb32(pb, strlen(t->key) + strlen(t->value) + 3); avio_write(pb, t->key, strlen(t->key)); From patchwork Sat Nov 26 14:46:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39471 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6217832pzb; Sat, 26 Nov 2022 06:48:23 -0800 (PST) X-Google-Smtp-Source: AA0mqf44Cn6dlC4vENjsnoAFZJsfQMczxj9Idor6LK4MrQjxlWDwmnpISgY2pyvuOtCd4rnuAiTL X-Received: by 2002:a17:906:32d9:b0:7ae:31a0:5727 with SMTP id k25-20020a17090632d900b007ae31a05727mr21017554ejk.540.1669474102974; Sat, 26 Nov 2022 06:48:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474102; cv=none; d=google.com; s=arc-20160816; b=vwi6yp9wXxCTdm4iRR1I7n/jt1MFkonRQF126MzjmRiYnhiYtOwQiq03vsVR9F7AhO f9BfwRKOstBrtA3Dmut01/ou6By3PKmdeE2Y+gVdNFlloGtiYNSg230kjggllSdHUfZc gkH8wbXImYDxtNNh9wuWX4LJrfBOXqrt/M7f/pzzoivrg4Og8WuDWyOaucQxYE22ibwP VxgnpqLZz3VKFaAhSTHF/Y9wzAoVDcK/bGeBbZvYMJ91vqR2oFdnjwTEipslqq1fbeRV /fC/EbKmjLHo71UdgpmGZr/XArdSxYbjEVBXR+//KpdWU8r1XxxjNFXVDo+7zx0Oorwo v5Mg== 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=hv7u9Jj+jTnAPXRnUY0V017r3nMJRrw0eE0Zl4h6PPo=; b=E+TeuE4RRBc/+tW2FISPcW/5rWkjm3qQcj/Z1eAOKGCyLF8ywKDc1hgt4iufXZM4Yz mDkAc9Pq/PyiKN6b3wA8Y5cmbWv4vt9xcuLobki1IT64zaEBIMoYlsJAPID6W2aHjbqV BaO+choMGtUHjteiI0pKhsZHoOnhMfjl8ydNbtNzwDxVb+YOT4AwuoHs2X43SuG3Y5LJ yuEHQVK36uGiV6p0Q2nXtR1iltXtE+oLWARdvogrU9IWaY7ZdnY7XEuIBDWeaF31bkM0 LiDLPSK5e71aK01hJR3X4tJfNEa3r9F8v4Vl6vsZRwtMYZWthkyd8QWmxNYOuVh/cdmO yvzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nxfV+TeJ; 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 nc10-20020a1709071c0a00b0078bcc872a6esi6424150ejc.360.2022.11.26.06.48.22; Sat, 26 Nov 2022 06:48:22 -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=nxfV+TeJ; 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 4B45168BACE; Sat, 26 Nov 2022 16:47:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 599FF68BACE for ; Sat, 26 Nov 2022 16:47:03 +0200 (EET) Received: by mail-ed1-f52.google.com with SMTP id x102so9954409ede.0 for ; Sat, 26 Nov 2022 06:47:03 -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=AzRyvPvnN57I87YpWq3RBoS5JRYqPXqaGlDKZ6Uq2R0=; b=nxfV+TeJm63NaOVRga5/P6CZGU5dtHO7ktJ/FWj3glWwEheBSVPpZsa/gRYGMTsWzr V12TAejHeQip9UOFutxdZG8uQeJn1FhzHQyyGzGB1lLQ+6sBbDeTujcBwJ9Vr/FRA636 BtM68YI0Mr99PGbagyzYODT7l5XdIubqBORg9sSDVIpbRhITz0X03sVyWqZS01pvNR5+ jz6amdKMdm0k2+2teSeyFXxTirFL8rb9CbUpW2x73/BeG6fQ6/b7Y2PUgg+uWGmX/x/V fd3fT2kUPEQt++nUpfiNfsrEYr/TmFR5Zqotjli+qFAZCulTWq7lT5yM6d+FhQi90hR0 RfAA== 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=AzRyvPvnN57I87YpWq3RBoS5JRYqPXqaGlDKZ6Uq2R0=; b=ttygFgtl4tPOCeRtlX7obM53d4VZgXSlZBMy01kfGedMUBetU1HYln/Sb9u4+qudMt TGJ4XXZQ17ng3zgK48qZOPp3NNoTm/jxwbjdTZbprnKBpf1wgp1JYjgZv4B+BAd9gFTi aFyZ3Ga/p/bwopD9CPaVUH4OaaBBOAeVi8qZ+06LDYMkiA2GT8N3wz9spXJHwMJklA8K Tq2f5oqsaXv4m/4PhDIicI6ysx46+gEjAR6YZiGbKhrx9aGYV4RCj08mQY3rdpdj71aJ +zADMB00e+nqB0ifmYolCY3Z+pb4AaGpUIqCbXAvjHamBGgZ1008hvUUuxxR3DOICDHD pGdA== X-Gm-Message-State: ANoB5pkoUa8A2GknSAHXSoRufV6CvHDTfMLR6Sn2mTNqWJcC32R9FtRo +Vlw400ZfbX7G/yrqtqf+sISpoRSyZE= X-Received: by 2002:a05:6402:388e:b0:468:fb0d:2d8b with SMTP id fd14-20020a056402388e00b00468fb0d2d8bmr8743652edb.124.1669474022808; Sat, 26 Nov 2022 06:47:02 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:02 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:24 +0100 Message-Id: <20221126144648.73162-8-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 07/31] avutil: 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: b21GvpCiDtf7 --- libavutil/opt.c | 12 ++++++------ libavutil/tests/dict.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index a3940f47fb..0a909a8b22 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1742,14 +1742,14 @@ void av_opt_free(void *obj) int av_opt_set_dict2(void *obj, AVDictionary **options, int search_flags) { - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; AVDictionary *tmp = NULL; int ret; if (!options) return 0; - while ((t = av_dict_get(*options, "", t, AV_DICT_IGNORE_SUFFIX))) { + while ((t = av_dict_iterate(*options, t))) { ret = av_opt_set(obj, t->key, t->value, search_flags); if (ret == AVERROR_OPTION_NOT_FOUND) ret = av_dict_set(&tmp, t->key, t->value, 0); @@ -2137,16 +2137,16 @@ FF_ENABLE_DEPRECATION_WARNINGS case AV_OPT_TYPE_DICT: { AVDictionary *dict1 = NULL; AVDictionary *dict2 = *(AVDictionary **)dst; - AVDictionaryEntry *en1 = NULL; - AVDictionaryEntry *en2 = NULL; + const AVDictionaryEntry *en1 = NULL; + const AVDictionaryEntry *en2 = NULL; ret = av_dict_parse_string(&dict1, o->default_val.str, "=", ":", 0); if (ret < 0) { av_dict_free(&dict1); return ret; } do { - en1 = av_dict_get(dict1, "", en1, AV_DICT_IGNORE_SUFFIX); - en2 = av_dict_get(dict2, "", en2, AV_DICT_IGNORE_SUFFIX); + en1 = av_dict_iterate(dict1, en1); + en2 = av_dict_iterate(dict2, en2); } while (en1 && en2 && !strcmp(en1->key, en2->key) && !strcmp(en1->value, en2->value)); av_dict_free(&dict1); return (!en1 && !en2); diff --git a/libavutil/tests/dict.c b/libavutil/tests/dict.c index d053545f4d..91567289c2 100644 --- a/libavutil/tests/dict.c +++ b/libavutil/tests/dict.c @@ -52,7 +52,7 @@ static void test_separators(const AVDictionary *m, const char pair, const char v int main(void) { AVDictionary *dict = NULL; - AVDictionaryEntry *e; + const AVDictionaryEntry *e; char *buffer = NULL; printf("Testing av_dict_get_string() and av_dict_parse_string()\n"); From patchwork Sat Nov 26 14:46:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39473 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6218009pzb; Sat, 26 Nov 2022 06:48:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf4Vls65paWs9req8X3rqT/RSBMU0JyMPWR+4/6vjWL4rmdCDYDLRy4fkRY0K76LeKe6Gw5d X-Received: by 2002:a17:906:4a8d:b0:78d:a4ca:32df with SMTP id x13-20020a1709064a8d00b0078da4ca32dfmr35274570eju.686.1669474119253; Sat, 26 Nov 2022 06:48:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474119; cv=none; d=google.com; s=arc-20160816; b=FB3FWH8eSS5NeNx9+RUld6lINbo7RfG/APRk4tXyBDVr54zqJmUjnDfuTkelXpzZ5X 84cSKHRgDJtONvknP4dXeczRCjfAQhHXt5ZUxpfsejw/4WAWpN15zkFKFNZ7ApNYE5ej KOvorXKEWTNRX9erYK+jBrtS50t3z4PrZAoptdx3D7R0yNbpiE8G9QqoKVZQgpKm7SmO u3Lx9ppxmaHGfVWdacVqJJd+22SSIysCDn2YnlW2J53kBvdTMSshw6tlnOhXWn3kCQp2 om81RJ/P/EM7ZNCQWC+9rkxVA1Usd781xbi14RCyme2Txp/XJyjp2oOJ2BdtoLWgoR7O GZkg== 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=tuWBv1OHXn3LmNS5neDiThmPCg8QSsYz5Ouz0FmEKeQ=; b=OW21CHpSmVVfLwHkdKydZWal1+egSnCtKU5S6pf5QrA9tbGzzZRLHbd2LMMUBkvHkf dfdB4OtRvyHblrWwtDIclLt7yGdcW7MNnZ5iERAm3MNwIs3pyYDe4bOIRJbK4It430ev cROstkJwG8/G2KE+A7clkz2SM1ERXiPmo2KhvPgBhRoytUS9MTU+fqnNoJs8gjj3WaaB eSqqrnSIcNgdN/byya29Gk1v/wfuGC2NY0pS5rzXL31Ig/NZKDWctdyVvGu+Ls4o8YR5 iKs+VxKv9waDgFJ2BLElWPGrVR3N0RMVxarnVe07AHxPfbEHuVD1DNBV9VqXFJKL6K+U wi7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=FWxDWThp; 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 f11-20020a056402354b00b0046a2b7d2452si6914928edd.255.2022.11.26.06.48.38; Sat, 26 Nov 2022 06:48:39 -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=FWxDWThp; 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 3B1A168BB5D; Sat, 26 Nov 2022 16:47:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A2B168BB3E for ; Sat, 26 Nov 2022 16:47:04 +0200 (EET) Received: by mail-ed1-f41.google.com with SMTP id r26so7793820edc.10 for ; Sat, 26 Nov 2022 06:47:04 -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=Xaf189eVqt5JS+t+POl4R9FximzKrQUyDREGkxwpb5o=; b=FWxDWThpdDAv8adlRFgFGtnYGfeS0gboLyuv9TQefuzsKc3ZjyJveKg0GJHOSXGkQN ziS+P5NKn3tzyzWunF0KcIe63/NhEz9FOWi74tuNZZzz60ysHZ22CTh3QhqtYtkrRA86 8WUSOTvBLbbAwdhWc6HE7oT9OPNVmSlkzOGDj+std5sd91p/5sZjcdt/JydrCr3hfmA+ hWnMeSFeE9/4kNy7E9crrPyh1eUJcxE7I5xkWa3TC59/MAAKhhNRa/saR0VJvbw3/Y9G akTJxC+A1buCDQmmd3EwJyuSuCveE0k/bwvYQP4rOVyOXEYMvTf4+Bk8ttnmpegzQ3pq 2MDw== 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=Xaf189eVqt5JS+t+POl4R9FximzKrQUyDREGkxwpb5o=; b=KrTT+08bnNUmENSz1bBQATo91hG6XWsTKszD5VWlSP76a78m4OsjkS1UHW2SfZ6ca4 CWV5IA/YA3pr7cvei/8kBCIeNXPb8xtp5N8mLvu3C+z0HA0XnB7cNhJ+67ZVOJs81+yU G6YfYf3uvwH3SVYB73vlIM2vGsOxHM63Vr7koo3mNIvzVfuG+zc5XXCWYEjAJS4vbw48 ZpC9N4aosNHesWLXT8d1UmGDEVTscfcp38kBwZl4nHonLvnHjsfEbzqFUXhzX/px4waO QACfHB1Ji43mDKCOnFV0nK5bcowH3sAtUvNL10eOvy6BjoFsYLf6Oy4vn8s5fxiucD0u kASA== X-Gm-Message-State: ANoB5plLpPjJba/HwaqBuvcqEIfFIxa6X+8iSJGX6WbBnKoMrU9OVdCm LNEulZW6qh+Lxj+YWPLuGC0FVvVi5aQ= X-Received: by 2002:a05:6402:28c9:b0:469:ba7c:bc75 with SMTP id ef9-20020a05640228c900b00469ba7cbc75mr21989927edb.286.1669474023568; Sat, 26 Nov 2022 06:47:03 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:03 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:25 +0100 Message-Id: <20221126144648.73162-9-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 08/31] avfilter/vf_scale: 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: EL8x7DN/bVr7 --- libavfilter/vf_scale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 2b12cf283c..b95e2e6c66 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -555,8 +555,8 @@ static int config_props(AVFilterLink *outlink) scale->out_range == AVCOL_RANGE_JPEG, 0); if (scale->opts) { - AVDictionaryEntry *e = NULL; - while ((e = av_dict_get(scale->opts, "", e, AV_DICT_IGNORE_SUFFIX))) { + const AVDictionaryEntry *e = NULL; + while ((e = av_dict_iterate(scale->opts, e))) { if ((ret = av_opt_set(s, e->key, e->value, 0)) < 0) return ret; } From patchwork Sat Nov 26 14:46:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39543 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6a11:561f:b0:33d:fc04:f431 with SMTP id rr31csp7374191pxb; Sat, 26 Nov 2022 06:48:57 -0800 (PST) X-Google-Smtp-Source: AA0mqf6Zz8DwuVaHCrtvhVjzE2sLSq6HlPVM1pNkn+SSSHGaGpDWgXau62IK0B4MykC0nJmon6rs X-Received: by 2002:aa7:d417:0:b0:46b:203:f389 with SMTP id z23-20020aa7d417000000b0046b0203f389mr925249edq.303.1669474137274; Sat, 26 Nov 2022 06:48:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474137; cv=none; d=google.com; s=arc-20160816; b=IoUzCqiHhA2IiGXMJ/+FtmKasxsiyBh0aGh71MbRFyrF3y3lyWO6h/R+xGZ4Lh89ss BgCiPpqdLkFlOSdjiMVmevxz3CYSYh4EmKr0Bh5m22EhAXUKMXZPP+iFl0iIr6jTwYWB 8YZ0dxEtbk8x/UARTBFFOyzUp7dZQZRcICxzQkqs5HcIApY2bz65eik9TgHM0OqtSEKX yG+FYReIRn1eJ/f45+zL+8kEHNRl8ZeF/ynYeSSix7Q6v4sVyxu0k3QWIrzh2VbbEH5a nxNutw7mzWw/vt9MdL8s+7Dwn1SKOJUStujUE5KDayzfYQnf0GyPGs+iFpxd4ciN5Z00 QG1g== 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=gk73GVKw5rnZNbPjSToul/fsmPMuI2cn8dOF5PZY5BM=; b=tz/yBcz7Jsgp4vZxvjEEYdiak3vY5EoU39Po9vW3UgleicDclX8BY2ga9s6+Jiy6wZ Aa4sWA25YDoGxplbOUQHCtEEIId2X14svRt3S0K1tgofyt1hwR6sWKgg9p6ZtJ83tHR7 vhH0ZcOBgAk/0BT7WkEh04pngDDUBdq7Ym0p7GV0Q3NKnumdr7+mxQ+5Qq2vqWDvkaAw t9qoY8Js3R6CH0Ui2LbtdDBay/hycxXcxsgfhi+YK7TrgDGs6L7SYHE39x7oA3Oylxt+ 0Lfo1auQr/zkhjseSe/0F802jYhS/MXq9fC8AjCQaXiLH3FJMlVU1EBUy5fGtbwP3LP0 7MZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=NtdMMSKp; 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 b7-20020a056402350700b0046351fa4ae2si5453728edd.99.2022.11.26.06.48.55; Sat, 26 Nov 2022 06:48:57 -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=NtdMMSKp; 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 81D4E68BB66; Sat, 26 Nov 2022 16:47:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1D5F68BB59 for ; Sat, 26 Nov 2022 16:47:04 +0200 (EET) Received: by mail-ed1-f41.google.com with SMTP id s12so9883883edd.5 for ; Sat, 26 Nov 2022 06:47:04 -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=pB6rZQ8AAc6k9zkhaEvwhA73YWfzxGi7cAx3LLPAXvU=; b=NtdMMSKpaQ20DLi5yeIm51DIfjQT6Gf563C1fcRK7tAfw2c5co5D5nC9SQQxA7OWYa F0M7HHiWWf5TJi66mxEFo0pNUzeaOUsvXAMDjD2ehQuPiX16QYZ52S0k4QtDR+4hm8gS 2zH4Fhnyz4Sxp/euLViFH2rDyt40ZMKzsQvDCp2AoPjDPZQIdqFng2gp82s1eld9+x0I 2l1K3EL1Lz3yuI/8R2Cwcard4RNxfbN6vYEH82/NUuigPOHkBjjBFFtPmS/dCVw9gbfh a+QrEHdak8mP6vx/f8JMktrf5ZwF5xqJLpH7xVUSGrtD6VxtX2mGOmj/qgCDE2ilLhh2 lPzQ== 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=pB6rZQ8AAc6k9zkhaEvwhA73YWfzxGi7cAx3LLPAXvU=; b=ZnDdAjhm1oqoE4hwlqaB6YEBYprZuaP/XVQA9MvS7QESJwS8DYXuR/mn3Yzq/JFiOf 6tNC0M8guvamQ8189EP+TntrfMLnb/a92EUWxxR4kVwsQ4wMw4Sxoc/yhasG4l1lB4A1 PIIlWZwhlQITsCaWR29tpIjU1RwitnzzZ/mGDMIPt9tbTbfImgDwjtASjYD7dTu0g+H3 fSqC6Y7CFkgqBINdKJRUdRdFJSq2T02ULUlXzJEn0MytLDaFgiMDn4308yNsVagcT5aB lyUzSpXrZ4c34g4H3J5Cb/WYoSTMu6mBrmiiMrYH+sf3QqQYrfC1/Js3xE/Qg1hPqZ6C ds8g== X-Gm-Message-State: ANoB5plWJuyd8gpVsJwZWvTqSGbIVKNUlYEpD6NB5QAINxPyyqYYyLbe 993zax2oG2FsJOctl5qh9ZCVfrsUkBo= X-Received: by 2002:a05:6402:294d:b0:467:6b55:3cf5 with SMTP id ed13-20020a056402294d00b004676b553cf5mr41037188edb.22.1669474024306; Sat, 26 Nov 2022 06:47:04 -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.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:03 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:26 +0100 Message-Id: <20221126144648.73162-10-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 09/31] avfilter/vf_coreimage: 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: Il6eQENxkMNz Content-Length: 2456 --- libavfilter/vf_coreimage.m | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavfilter/vf_coreimage.m b/libavfilter/vf_coreimage.m index 874bdc8c56..b1959861de 100644 --- a/libavfilter/vf_coreimage.m +++ b/libavfilter/vf_coreimage.m @@ -416,8 +416,8 @@ static void set_option(CoreImageContext *ctx, CIFilter *filter, const char *key, // set user options if (filter_options) { - AVDictionaryEntry *o = NULL; - while ((o = av_dict_get(filter_options, "", o, AV_DICT_IGNORE_SUFFIX))) { + const AVDictionaryEntry *o = NULL; + while ((o = av_dict_iterate(filter_options, o))) { set_option(ctx, filter, o->key, o->value); } } @@ -427,10 +427,10 @@ static void set_option(CoreImageContext *ctx, CIFilter *filter, const char *key, static av_cold int init(AVFilterContext *fctx) { - CoreImageContext *ctx = fctx->priv; - AVDictionary *filter_dict = NULL; - AVDictionaryEntry *f = NULL; - AVDictionaryEntry *o = NULL; + CoreImageContext *ctx = fctx->priv; + AVDictionary *filter_dict = NULL; + const AVDictionaryEntry *f = NULL; + const AVDictionaryEntry *o = NULL; int ret; int i; @@ -460,7 +460,7 @@ static av_cold int init(AVFilterContext *fctx) // parse filters for option key-value pairs (opt=val@opt2=val2) separated by @ i = 0; - while ((f = av_dict_get(filter_dict, "", f, AV_DICT_IGNORE_SUFFIX))) { + while ((f = av_dict_iterate(filter_dict, f))) { AVDictionary *filter_options = NULL; if (strncmp(f->value, "default", 7)) { // not default @@ -477,7 +477,7 @@ static av_cold int init(AVFilterContext *fctx) if (!filter_options) { av_log(ctx, AV_LOG_DEBUG, "\tusing default options\n"); } else { - while ((o = av_dict_get(filter_options, "", o, AV_DICT_IGNORE_SUFFIX))) { + while ((o = av_dict_iterate(filter_options, o))) { av_log(ctx, AV_LOG_DEBUG, "\t%s: %s\n", o->key, o->value); } } From patchwork Sat Nov 26 14:46:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39540 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6a11:561f:b0:33d:fc04:f431 with SMTP id rr31csp7374342pxb; Sat, 26 Nov 2022 06:49:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf7m8U+/O3DDVztFaPdrKLpf09LdsIY93GLZ5u0+Hd6sw1qFUSkRYNIJEKH/jRr8CpTiMl3p X-Received: by 2002:a17:906:ce35:b0:7ae:215:2dd5 with SMTP id sd21-20020a170906ce3500b007ae02152dd5mr20924812ejb.208.1669474152739; Sat, 26 Nov 2022 06:49:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474152; cv=none; d=google.com; s=arc-20160816; b=IsDJOTJi44IWAf7xXOf9S+BMzC83elWXDIrauwoeSNxfNdehf/vC6PDrdDG4v5JZkc jL67FS9jQZeOtJbrqQtuezrqHGpAjjjiTom64cfaHgP0+HnxkaQbFYLSTC4vO9EMQUtk +U5YgrzQt7PNCWf7ySZw9EVpYItl47pE3LDr37G/j83IGVwd9Qe3WXODWePR87gX76AW uiTkWhHr5cMFlSmjFi2/3NMzbYrpgN2Zofhxs1D52amCKDKN8hWre6wosP3dGfBm5c7Y VrGddoI+/h+J+8VAqIK/8lrspoBTLhOZHLHf8sz/JefDyDHzHbKdTD2LAAREbjaXKQW3 /hig== 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=om6Trc3To+zYZ4ZgH9QIPzFOreLbhMuwnB4TplJ6V2U=; b=vriIezSZWhkpN/XjxHdZR8ubi5nBvSWfgMMOlGTenbuEWage/BSbD9kIftWfCv5rjo zJ/ZMBMs7ROwEmPk7eo1kFsdLTmxGKFfCGYgOXNHjsMNTRmVRPYynTv2HDlG3EJPA7rh h17fD1DLmQuOl6tQR/n2ZHsS/XKLbpRNamCIov87Nw8SrFKq2f5+6bacRIZO5UkutdI+ EjODnnvcJ7CT/Dk0fXdZRIbzem9USNrq9ZQNrGXrQLngnO/YsDk1dgjouteVnsrVWKS1 MdX4Uh8crOtzN9vt60yUSo0D5XUTue0p/giLL/u3wiF43aPyznjUChhcS8sR05TGWJuJ lGhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=cHgfYvNI; 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 dd20-20020a1709069b9400b007ae8b1704d0si6689934ejc.68.2022.11.26.06.49.12; Sat, 26 Nov 2022 06:49:12 -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=cHgfYvNI; 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 D48AC68BC47; Sat, 26 Nov 2022 16:47:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 91E5968BA82 for ; Sat, 26 Nov 2022 16:47:05 +0200 (EET) Received: by mail-ej1-f53.google.com with SMTP id vv4so16116499ejc.2 for ; Sat, 26 Nov 2022 06:47:05 -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=KcRM04mJHdXToDuxlBO+aJ/ZBx73e6xtKKloC+b8x5c=; b=cHgfYvNI2yCRmG2qkHR2Y+pON2u2D9j3Fpz5agDLX3ACj83+AzcIRbKN+AQnyPVVJo rAyzAsIf5HEPxYs6GEQ+8k1m16kVZz6rySuSQ13Ik2iiP1MjWVkLODQ8Cuvm4cD6A9HM c38yhce+JbEzvw84kR5x2f2OGkDTtSeCsjjiZ7DjJvY6m+b35KxiDx7bUvYEtLUi/DZr i+3HeRM2ZQbQy/8JTku2XyjHBJBsZS2G+1acGhDm/d3DcYvGVc2UjSqEDl/yoejTOiAz rjrA9kYeyPDb5RjWK0kwVKAyFTbC+JMkqPopH30yO0S2Ln20TrVnqOyDEB0Ssbo8+Gbt LQYA== 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=KcRM04mJHdXToDuxlBO+aJ/ZBx73e6xtKKloC+b8x5c=; b=TTBey7cwc/I3ttlhYfrqCLwIfeC9/r92nEJxNAGyzo0hgmpOqQTDOjuTav6rMPe02G HCPQWlfrMmIMSF22VecYUpCYTtmXG5wvg9CWbftx/U8xvMP9au8zfEjwRpttijGqwXV9 l4aiP7BdKV/+tPK7+q4Lw/xCByAPKFDxPLetDc9WyfoLya4zTtJvp+LFDhPGeS7eVALr 0RrbUeCCciyd43wVRddHlMqRXPN9q3PVLnPl3gT5mliHX3URBRzFlBAiD1BAIIgYOmfo PvDMKGTEQ4S1ym4YZPJyA6EVRq0I+c5jM+BB3QJVVE38oUwWkzN97j7UMFywMRVWcs38 6EvQ== X-Gm-Message-State: ANoB5plqnzwTkYoR6EJ78ntTq5Zla7uwIWvLOVLJs2/lB3HYzr530x8Y 9FvLaqzUoB7W+o5uDFACGmFV/shaPVU= X-Received: by 2002:a17:906:17c9:b0:782:fd8e:9298 with SMTP id u9-20020a17090617c900b00782fd8e9298mr20569206eje.640.1669474024999; Sat, 26 Nov 2022 06:47:04 -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.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:04 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:27 +0100 Message-Id: <20221126144648.73162-11-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 10/31] avcodec/libxavs2: 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: tuOqM5Lov9k3 Content-Length: 972 --- libavcodec/libxavs2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libxavs2.c b/libavcodec/libxavs2.c index 1672edfc07..c493ddc325 100644 --- a/libavcodec/libxavs2.c +++ b/libavcodec/libxavs2.c @@ -96,8 +96,8 @@ static av_cold int xavs2_init(AVCodecContext *avctx) xavs2_opt_set2("OpenGOP", "%d", !(avctx->flags & AV_CODEC_FLAG_CLOSED_GOP)); { - AVDictionaryEntry *en = NULL; - while ((en = av_dict_get(cae->xavs2_opts, "", en, AV_DICT_IGNORE_SUFFIX))) + const AVDictionaryEntry *en = NULL; + while ((en = av_dict_iterate(cae->xavs2_opts, en))) xavs2_opt_set2(en->key, "%s", en->value); } From patchwork Sat Nov 26 14:46:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39535 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6a11:561f:b0:33d:fc04:f431 with SMTP id rr31csp7374490pxb; Sat, 26 Nov 2022 06:49:28 -0800 (PST) X-Google-Smtp-Source: AA0mqf7rB2MMz0P7x7jCGE8HvGRwcEcNAGaV3JGarNqCIGmk0gB2Z1BA0IdHYy0c0lBBTpfsN293 X-Received: by 2002:a17:906:fcc2:b0:78d:8b75:b161 with SMTP id qx2-20020a170906fcc200b0078d8b75b161mr38173024ejb.385.1669474167996; Sat, 26 Nov 2022 06:49:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474167; cv=none; d=google.com; s=arc-20160816; b=zKxpA6zD7f6lq+yq3mO40y845NCRYlBaqf3lz2Jb4b0qPcqu0Vd+wcTKG4VLkgfOdD MqXHNOeNubkdPKPbPk6Rf1g6y5pcIe8/2obPIOUIdHNz3pB6tVrX5hB7SiR1FfnKA7zU f00RliV8kg63brwVHpzRF51SWWk4VBIv6BMpvxxSctuzOGlHKZv1o87bDEkmHNyITCjx ss/xRVpepb5CIN0lWFTIVRzUtFqxMOUR2ouDL6M5VIpiKAfRVCJBPVq9UU6kiCbGlqkc WyYHubq/jialD6l53uXpuCqlZiYAsBjoRPs54QGgpZvwzGQeSOf+mSyAs27P3Ow8ZBdF qHjQ== 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=Tn/6rtlj5rcAaCfd4Osdm+S6snlRVkK56GYx8XyIOko=; b=M5n+ChT81u/w9F9cHBy6zAIIDOKNLvVouzBN1/3G5yIBxDMz4hfItWdvBLMs1BiOCT iH964XNwAqlp+dQzBJJ10CAbY/bvylvDeuyNeV0jcNBMFyD25AlkddhxfBcRlqLNMHi9 WIDLKppmNI/1KyYOHefUM4M2KRXQ7cz+3fUHBRa2xRyJZEWv2e+3+YNDBLs+0XcFtkdC pN7pSXNmFqtgsrQpNr3MiwUpYyJOog4+Q/3dJn9qm8bySY/mUKOSsNZsq9GvSkUhe7VV PcNjsGU416oWdooFAvwVriZHULuOxHNRD731HzWmgV7oi5FbWrvx1sxeq4USyMGDvbJr OZGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=atUbGqkM; 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 qk38-20020a1709077fa600b007ae6e307f60si6121993ejc.323.2022.11.26.06.49.27; Sat, 26 Nov 2022 06:49:27 -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=atUbGqkM; 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 D05E468BBD4; Sat, 26 Nov 2022 16:47:22 +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 E6FFD68BB66 for ; Sat, 26 Nov 2022 16:47:05 +0200 (EET) Received: by mail-ed1-f51.google.com with SMTP id b8so9867832edf.11 for ; Sat, 26 Nov 2022 06:47:05 -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=cF2DCM2JRagVDlYLtkRXz5cNc+IyCzd/BzHkzx5Fbco=; b=atUbGqkMwekSKzkxhzWQHHmGWbpuD2uR/NMwXEo6HXdytAwId0Op9R9P8OhRPV9Qyd BxfJWgFFQ0TQXkr4lePxCqhFtzF57kSCvcXazWutYo2H+GrH0JNYguuik17UJCj70J83 QIYE9Domx1qMyx/W9yt4gLn/CbJALsuipKPRlpmucFQg8Mzz+EVV0pNXsTZLSW1GBv/T g5JGBUYrvg6DEJCQh8urZxHxrxdxgUmEx5kchgPhizlQZ1O97AmyPYR3HUb7LlUGb8uq oxoG4HAn2AqzIO7oD+QaBZacian4B4IQOt9fXFJlFMVOdymhYYwzIVUc/wFi12egISow LOsA== 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=cF2DCM2JRagVDlYLtkRXz5cNc+IyCzd/BzHkzx5Fbco=; b=xKJqjMT4cd5QV24iZJA3v2sHDNE5mZjpMSqFglxy6tBxrF66nQAZOUWIghAnhbUx97 H6gFomoC316OIsya4DOQP2MuAS4yAVQgqsd3ZNnSwp/ZB2k8KpaFECN7pFhYNYrhHBja Vh5MMQCWBDJjJ0yCIrEPXb7LxyCwx1i0AFHq2RlJjTh5Lsq9yflvsf0vkFfzQje47hF4 wZJqWikORNT2Et+GDKzY4Bzhi1GPPQb478IOWRJLGd7QoYg51vWhI58CcWu38bXlXhe2 okorcpRXlwxDmu0CH2ejIMH3gljFeNC4vBX5bqEMuknwsJyFPL2DoQO5nLnMMuuH+xK3 c3Sw== X-Gm-Message-State: ANoB5pmId2Pd/bqKK9pueSp0oPGmN1Bv6Fc264a3lP1VdLirZBJh8Rb0 Fquy9inzioV0V8zYgwhhIHDtzYG1UV0= X-Received: by 2002:a05:6402:d69:b0:46a:392b:2440 with SMTP id ec41-20020a0564020d6900b0046a392b2440mr16699645edb.341.1669474025740; Sat, 26 Nov 2022 06:47:05 -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.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:05 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:28 +0100 Message-Id: <20221126144648.73162-12-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 11/31] avcodec/avpacket: 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: bKxz/ihaU05N Content-Length: 959 --- libavcodec/avpacket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index bcbc4166cb..5fef65e97a 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -316,7 +316,7 @@ uint8_t *av_packet_pack_dictionary(AVDictionary *dict, size_t *size) const AVDictionaryEntry *t = NULL; size_t total_length = 0; - while ((t = av_dict_get(dict, "", t, AV_DICT_IGNORE_SUFFIX))) { + while ((t = av_dict_iterate(dict, t))) { for (int i = 0; i < 2; i++) { const char *str = i ? t->value : t->key; const size_t len = strlen(str) + 1; From patchwork Sat Nov 26 14:46:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39468 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6217629pzb; Sat, 26 Nov 2022 06:47:58 -0800 (PST) X-Google-Smtp-Source: AA0mqf4kn5F4eqgpWpgIjZC5r9dPrTr2/+i6BtgUXIZaOvIir0Musfy5E5y9QPeS/memix/nK5Yc X-Received: by 2002:a05:6402:240c:b0:462:2c1c:8791 with SMTP id t12-20020a056402240c00b004622c1c8791mr26819943eda.29.1669474078471; Sat, 26 Nov 2022 06:47:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474078; cv=none; d=google.com; s=arc-20160816; b=yvp8dssnWlbNm3CCFYh5lBoScFVGrMKsaxdLgPOnl3w0KvG5XMdntqpg8n0U49Jhan 8cR842xNZAgxDOKdEkUnopTPuqAy3kGPDp7/F8RUWQoJhluBa2V8S+5Jih+SWNwTik+i KbSKJXVugcrs50UwGbmJOqqjBXTu9cmEt26mzHlpf9m8TDyheavGC/vvch8BJPEWMRIM +i5OH5M27Mv/o5/Ey/liNcnUu56iH15NfHJx0KbBfNLxyH78vLWxwkVImo9VjvoazHwd WFe1z1TuWOgIIjfHnFZOkPPlm2T0bbfOMF1q7GVRB83jCSefq2UM+rrkxhSlJWcqcHrs +t3Q== 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=nxl/yJAR2PI3/+7SipZpBZ50y169gpUPdUMRxF9suzE=; b=m46cnd8OP7nsnw1BdHJvzsj9RBo3fCwO60E3Ry/Rimnw0TfWpCYbkQ7laVeVNxkfjt vnVVri/r+sOHLJvklNNNgGc0OvVPL0UDorMWoGbPW2Cw5h3x4CV0fWKk7h0uvAR60G7A CnVHBcJ0wQs/5XgynLt4A6C75hDOBLqo5iMZ9FN0K+fs9gWONOA9h2c6+pNbp5fiGVUi DyJ82aUHXEDM6C/W0haNSp3Go3O/z4upgvhPT+Tv8aRSjel8wwj3IcxU7m7YWNK4b2PE WwZH7xu8IRvndcndcHN1knsfHJv/vzwMLB5qnyP4f6V+HcRegADdwPICUiNNFtgQveRT vAUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=JBUXEgEe; 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 i13-20020a05640242cd00b004587e99bcc2si6800142edc.383.2022.11.26.06.47.58; Sat, 26 Nov 2022 06:47:58 -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=JBUXEgEe; 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 06FBA68BB74; Sat, 26 Nov 2022 16:47:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F228368BA7C for ; Sat, 26 Nov 2022 16:47:06 +0200 (EET) Received: by mail-ed1-f45.google.com with SMTP id z63so9903074ede.1 for ; Sat, 26 Nov 2022 06:47: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=0T3GmCt5crLf07hImSNUBki7vfPbvgucLcdCCzkuCM8=; b=JBUXEgEe0VFm9w6JH0xUl0T9YtMtHHlRy/rpVFY04Kgimyp7R7O4d1/l6sccW9Tyfe VpUgSvSCyCfqIjYZ9ZXj2I7PddTXre/REULdnmW1mcfFfS0nTiCmIcOQqsNHvLxsZClN XCtcyX0VLsB0o0AbUALIl7SFMTfHJph1b/xAubX2HpfXKvou+QWLCoaS0+ODRyQCNnw6 PCqaCOfk8QjlVUbYE3FpWUp1EQbhHVRC2KPUwSTyFHYnzyYNBAt0iRM8EETjM4WciGcr f880nGPhloo1gVdEHkE9c1BUI4LbeIzEMU4w7tRsOQbcpgrhASJWsSpnCpecVXhrAYXn zUww== 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=0T3GmCt5crLf07hImSNUBki7vfPbvgucLcdCCzkuCM8=; b=MKI2DrGuRCF3uqhESaJbi/tvyPvWigwWMjSd/2JbHyUNyyXuLm8bfOOeuTkxsn9/t1 ED2R/OJk+eM+f1kVo8C3uNt3gWV2fQbtHshrY3HBjBRoGVye0IpHf+MrrUDI1TSyBKAK 1cIQnyIm1vqyxyfPETruy3QsdKhEUHDl3gOiEt2SFREXq9VjSMRVBB5AlhquxcBumwac 7b06ee/ofvyp08wLAp97kJAC5lJ9FDtfrSrklEJTLgL1inzSxhgGazQM2DhLnfnP8qK7 tCHQZsyapLmHxpmmCulgDbJFSmCYXEQ+PJlpAYBnzi9vunLF6whScNFFDZKsq86JT6vO PI+g== X-Gm-Message-State: ANoB5pmpnerctemoChknBUKdYrdshWEZzto8w9zVWXO4KqXg7jIZBudw fX00mECAmqxua04Jcpmf7Cw/iieWjWg= X-Received: by 2002:aa7:dbd9:0:b0:461:e8c4:d21f with SMTP id v25-20020aa7dbd9000000b00461e8c4d21fmr8386319edt.186.1669474026425; Sat, 26 Nov 2022 06:47: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 ay10-20020a056402202a00b00461cdda400esm3107745edb.4.2022.11.26.06.47.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:06 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:29 +0100 Message-Id: <20221126144648.73162-13-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 12/31] avformat/vorbiscomment: 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: 5rxNCjTX+97z --- libavformat/vorbiscomment.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/vorbiscomment.c b/libavformat/vorbiscomment.c index 13ee065a44..abe12fd586 100644 --- a/libavformat/vorbiscomment.c +++ b/libavformat/vorbiscomment.c @@ -45,17 +45,17 @@ int64_t ff_vorbiscomment_length(const AVDictionary *m, const char *vendor_string len += strlen(vendor_string); if (chapters && nb_chapters) { for (int i = 0; i < nb_chapters; i++) { - AVDictionaryEntry *tag = NULL; + const AVDictionaryEntry *tag = NULL; len += 4 + 12 + 1 + 10; - while ((tag = av_dict_get(chapters[i]->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) { + while ((tag = av_dict_iterate(chapters[i]->metadata, tag))) { int64_t len1 = !strcmp(tag->key, "title") ? 4 : strlen(tag->key); len += 4 + 10 + len1 + 1 + strlen(tag->value); } } } if (m) { - AVDictionaryEntry *tag = NULL; - while ((tag = av_dict_get(m, "", tag, AV_DICT_IGNORE_SUFFIX))) { + const AVDictionaryEntry *tag = NULL; + while ((tag = av_dict_iterate(m, tag))) { len += 4 +strlen(tag->key) + 1 + strlen(tag->value); } } @@ -77,9 +77,9 @@ int ff_vorbiscomment_write(AVIOContext *pb, const AVDictionary *m, } if (m) { int count = av_dict_count(m) + cm_count; - AVDictionaryEntry *tag = NULL; + const AVDictionaryEntry *tag = NULL; avio_wl32(pb, count); - while ((tag = av_dict_get(m, "", tag, AV_DICT_IGNORE_SUFFIX))) { + while ((tag = av_dict_iterate(m, tag))) { int64_t len1 = strlen(tag->key); int64_t len2 = strlen(tag->value); if (len1+1+len2 > UINT32_MAX) @@ -109,7 +109,7 @@ int ff_vorbiscomment_write(AVIOContext *pb, const AVDictionary *m, avio_write(pb, chapter_time, 12); tag = NULL; - while ((tag = av_dict_get(chapters[i]->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) { + while ((tag = av_dict_iterate(chapters[i]->metadata, tag))) { int64_t len1 = !strcmp(tag->key, "title") ? 4 : strlen(tag->key); int64_t len2 = strlen(tag->value); if (len1+1+len2+10 > UINT32_MAX) From patchwork Sat Nov 26 14:46:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39470 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6217756pzb; Sat, 26 Nov 2022 06:48:15 -0800 (PST) X-Google-Smtp-Source: AA0mqf49dxfEZ85AQB5tQmnUdYi5l99rEDZiCprZD5vEFXpeP07gNirHkRpV4Uein6hm52XSr+LE X-Received: by 2002:a17:906:a198:b0:7b4:bc42:3b44 with SMTP id s24-20020a170906a19800b007b4bc423b44mr28983280ejy.101.1669474094876; Sat, 26 Nov 2022 06:48:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474094; cv=none; d=google.com; s=arc-20160816; b=y8BCaM1iXk1k0ePl+cPBxGKff/Yu3HHgI7pzGI86KRCcicgoPfWdptYk1t9+XLobNG 6npT9mmh+LO9O+HF8npSrwQCpM8DRw8q09Ey1izbKHM2Ay/pZVxU5WK3W4m4msgAP90C j+A7UKC3ivwMqWn4yuWa0c9qQiGXMuOdR66HO5EgJJKlaTkElI3nLeDPi14dac46ZzsK 2ECTX8FslI7NBtCCkEdc/qBq0kFh42TNIAiDA/UC3iAy8el1QjMa1EFDnEvcrPvNbvBb O7JUt/pLeBgdyrP8A2MSNggQuMwssMOxYWtjScl4BKS/Ppux0yRuVyKmAJYgW6pwCCcQ 863A== 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=A1UGMuE8dJ/kx9gYp43Dlkk27BisZNoE0aGblHAeTRA=; b=ZfUStUE2+OUtNZNb5cQMu6vX1EvYaDWLHu4/cw/1MnDzeeKbIWxsTQwNabUXv6/sfG K6twA2JfxLOn7ed9gxkP9fTqzg5gnc2Lez98O0J9xRuvA4NdMt6p/RHqYwJ4H3zdYM9w nEeBUDtyGcM6rI7PeNSBXN6fU7AZPZ25SHoxaeEV46f+A6HvoSljXT9X+owQnzEHFBn1 bJmWPsefWprj5boqXB3cdHIJddXjqxudxMG5IDYfxdn6vBFd0nVB+hDS1gWKRIc0r9BZ 8ARBn4Wj8suBB/6xfNml82FMADQJiHaTxTAPWH35LpLNh+utS62ewQyiBu6Xycs8bnw+ nOZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=AmjPZer8; 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 t20-20020a170906179400b007ad9885d2b1si4381651eje.301.2022.11.26.06.48.14; Sat, 26 Nov 2022 06:48:14 -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=AmjPZer8; 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 41E8468BB84; Sat, 26 Nov 2022 16:47:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 012F368BA40 for ; Sat, 26 Nov 2022 16:47:07 +0200 (EET) Received: by mail-ej1-f41.google.com with SMTP id bj12so16002509ejb.13 for ; Sat, 26 Nov 2022 06:47:07 -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=6oct+V8mPf3l4jKBQ3gtYdX4r5BJZbkPsD8tlvXu8UQ=; b=AmjPZer8nPKBI7iMfDp6GFfM/R5UI6JFpJL7pVEOL0corW6QOFxEIPjitZsVH62Gzh zkPCCnvJPF6lI2bD2GCVam+sLi+jTpUB9+Ydjvh3m0GoL19hDG1Zu/tvqFe1num7OUVR D2xcFu3QuS5VzyJzV9KQm9PqjM/vEsEVJ+/aYPfSstuuq8phaIvOw9l8rTAmOXKsKi9S tyDcwNyftaHqVUhDJ/MfoH5ML0YnbuDd8ilzpEzcUovEWhRvklhbp5fgKTyunNSsPnj9 lv/kNcZb2NKaHz15XK5ddnLYPif9AuPzIYmQ9ywBgiVQRf13P0Tz9x4+T8vemGQ8nMFF MTUg== 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=6oct+V8mPf3l4jKBQ3gtYdX4r5BJZbkPsD8tlvXu8UQ=; b=RlxQCrtdH9q/yME1sVUCgJwj0useTFOnXpSOLj8pWiCgElvJ4x1s9Z+BLifV7MsU99 idjHhi9jkO4VLHLPv7Uncfsm8mnascaytY2hM7wiv8fdddplATg26HwZKHnp99TedxYL 7gaNL/X/Wy9BXI7CVpqj2ZGdAN7/F1EDR9zNWXbAzCbDc1aF0DR/SPzyD72Q1zKwha67 DxAG5SpxkWxOFQaoGOGOX62URi+wV8PvPolIkMkMZNQPfTLcXgotn+T5eb/R7ptxovfU JQQ/1qtc8wlfUq3grXavLPI1uqkKjGcJdSsw/7+kk2D4cfTojdUkj7S2Tac/cb+XqMOi 3o1w== X-Gm-Message-State: ANoB5pm1bURtEIxx3tLthmehi/idXYjo5vojLXU0hLFEgC9GIExGxQiF CgPt4FfPlGzjoncy/M/8eh+k2GmcLZU= X-Received: by 2002:a17:906:34d0:b0:78d:c16e:dfc9 with SMTP id h16-20020a17090634d000b0078dc16edfc9mr37084569ejb.327.1669474027083; Sat, 26 Nov 2022 06:47:07 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:06 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:30 +0100 Message-Id: <20221126144648.73162-14-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 13/31] avfilter/vf_libvmaf: 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: yGcuQg0q4HeG --- libavfilter/vf_libvmaf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c index 8f649c5b02..2586f37d99 100644 --- a/libavfilter/vf_libvmaf.c +++ b/libavfilter/vf_libvmaf.c @@ -236,9 +236,9 @@ static int parse_features(AVFilterContext *ctx) for (unsigned i = 0; i < dict_cnt; i++) { char *feature_name = NULL; VmafFeatureDictionary *feature_opts_dict = NULL; - AVDictionaryEntry *e = NULL; + const AVDictionaryEntry *e = NULL; - while (e = av_dict_get(dict[i], "", e, AV_DICT_IGNORE_SUFFIX)) { + while (e = av_dict_iterate(dict[i], e)) { if (av_stristr(e->key, "name")) { feature_name = e->value; continue; @@ -295,11 +295,11 @@ static int parse_models(AVFilterContext *ctx) for (unsigned i = 0; i < dict_cnt; i++) { VmafModelConfig model_cfg = { 0 }; - AVDictionaryEntry *e = NULL; + const AVDictionaryEntry *e = NULL; char *version = NULL; char *path = NULL; - while (e = av_dict_get(dict[i], "", e, AV_DICT_IGNORE_SUFFIX)) { + while (e = av_dict_iterate(dict[i], e)) { if (av_stristr(e->key, "disable_clip")) { model_cfg.flags |= av_stristr(e->value, "true") ? VMAF_MODEL_FLAG_DISABLE_CLIP : 0; @@ -355,7 +355,7 @@ static int parse_models(AVFilterContext *ctx) goto exit; } - while (e = av_dict_get(dict[i], "", e, AV_DICT_IGNORE_SUFFIX)) { + while (e = av_dict_iterate(dict[i], e)) { VmafFeatureDictionary *feature_opts_dict = NULL; char *feature_opt = NULL; From patchwork Sat Nov 26 14:46:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39472 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6217913pzb; Sat, 26 Nov 2022 06:48:31 -0800 (PST) X-Google-Smtp-Source: AA0mqf5sXBhKc4NVu+YQ5IL1bk9jHdrfRADLwqN6bDwPkcHn+A7yDEESeu3Fb4ZLlnadFejoZZv8 X-Received: by 2002:a17:906:a147:b0:7b2:7b45:2cd2 with SMTP id bu7-20020a170906a14700b007b27b452cd2mr36769291ejb.615.1669474111189; Sat, 26 Nov 2022 06:48:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474111; cv=none; d=google.com; s=arc-20160816; b=nXxfTRIqH41YvDdSot40EwU3HgBz//5qAjA5PXtgdNcwp9YqC5guxQ+LbkF+8AZ9Ss LiSchE/Syv8O8iOVoN4pFVCotD6zM+7shZNICh6lg32/3v3BbydEXoveArm9Q/uEy8Eo kYLDDyMn6aHjWmN2iJJMlT4koetwuq1eBw8Z+Oy7F806fQpREj5SUAB/urcfWoZCpTtW V6SCNeHOYVw7frjNY/0oBqxjNV2bg6uEmeTgTe6apNfS5SmIAtE9GO/GA5Kpq73wOPDb ajYMOb5aNGAs3B43J4tnC2GBe/dhfsw3pFdg0FESkb3m++x3/wW7bwxDDw5plxHyJk8V 8AwA== 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=4h8XefT9Tcp/17Lb+sAmCHOnm2jXiIxk4JPFNY+2jp8=; b=n9p0yR/wkXCrWVcWFV/9Ov2Ag2L9VmpNxPITS6jkj06wiXrBwtjOCGwZMOzruJCXGS JEVEkQAYSxsqSvbbvmXUnr7xoPbpPGe1jCtcTWPyIUTr0B7s4fSjjoOgWMICiDXMtqgl byCllIB5Y3AtrXB6lkHGKiJaoXEGZhCmKkUK0nTAGnzYwlrGqWH69jtY5JM1XwQ0Zyhf +durzoJiyOfUA5ecjMs5XDLRauZSBysil2szRXvChXc3ETsjpb2oxF3myVwrg2kOnc8H tq0abXJNyEibISY69El8sG9sADZ7sxlpBAAiRFm0RmId0Vt4Z9bYWQzfeteEPZcOFFIz ZLQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=dYmaU72Q; 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 h11-20020a170906828b00b007baa6c21a35si4686676ejx.912.2022.11.26.06.48.30; Sat, 26 Nov 2022 06:48:31 -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=dYmaU72Q; 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 469F168BBE3; Sat, 26 Nov 2022 16:47:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A9D868BB03 for ; Sat, 26 Nov 2022 16:47:08 +0200 (EET) Received: by mail-ed1-f45.google.com with SMTP id x102so9954596ede.0 for ; Sat, 26 Nov 2022 06:47:08 -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=vaEtfww3TrHuT7bQLZ6OqR4o/z+mfSKSTBJiTweB6lM=; b=dYmaU72Q/TKDwo6rQ2RMZpRVZY3y+G4TWnTxxD8nUK9TawApgWu1cmPe109UIV5bii DFu9FFWtgXXwSA8zO3u4+4vQDB4/RgMIGcE6CkXnkGfPruqKCV3p4s2k23FDTTXdcFPg WvZVQxvnpnpYqC6yhce5ZlaQKAZuwam19gcI5jg6xjnM6naz3r4j9Z1TrNe+C4tbAyc/ z98dFDMbfQ64ReqpUC2Gx5RcZrNRqQuqC3ABEJFKIIdbe1aSXUDNm52pQKLgDJhyC6wV 0ZPaBjaRwf+AXK1VIQDMe57cDitnpz/vu1UdkKvjX5ohh/Gvj3UaS6sZERxLAnx4sgZa GVhw== 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=vaEtfww3TrHuT7bQLZ6OqR4o/z+mfSKSTBJiTweB6lM=; b=ov6h10FpmGwu5ByTool5EhaP/rZxMBijXPPb32DJqAvFrjaG0WlCmJOrpxZJ7D2cI8 66bKoqLgHftYjLe8a3ecrUtFRky8VWdZ0P7/vTzFiONUQ/p5rRGcs0kDQhC90ECgIfsN SeT/gT0lKtgaMuQn7Khuuw85Bkd2HpHDaSbZoY4JnqweQ0IOhzRm0A3wIyWQVcZIxXfq zc7ZAbx8BmMNgTxXTtvZUNB/m1rKfJAeDYTH1ut84SwtTxdXrnqnskUmnRyUdS+oEHzf xwAWvDN66bMHGYTDWBlu+A7TCTavq8Ov0G+Soke1gn12qbE/m6vTurkiVyGkc7Nrb6Gg vbuA== X-Gm-Message-State: ANoB5pk0LxlKw93FkChs9ecFqauqnY04IuZkU71jArj1vp6Otoc/ApZ3 zlKr49YQRSP+/RLHCxsg6Lr1sSTDDCQ= X-Received: by 2002:aa7:d5d6:0:b0:459:4e32:e1b5 with SMTP id d22-20020aa7d5d6000000b004594e32e1b5mr39695156eds.424.1669474027818; Sat, 26 Nov 2022 06:47:07 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:07 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:31 +0100 Message-Id: <20221126144648.73162-15-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 14/31] avfilter/f_metadata: 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: 6q9nz+sx3Caw --- libavfilter/f_metadata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c index 82491f2bb8..4b7cfb0cb7 100644 --- a/libavfilter/f_metadata.c +++ b/libavfilter/f_metadata.c @@ -308,7 +308,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) AVFilterLink *outlink = ctx->outputs[0]; MetadataContext *s = ctx->priv; AVDictionary **metadata = &frame->metadata; - AVDictionaryEntry *e; + const AVDictionaryEntry *e; e = av_dict_get(*metadata, !s->key ? "" : s->key, NULL, !s->key ? AV_DICT_IGNORE_SUFFIX: 0); @@ -339,7 +339,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) s->print(ctx, "frame:%-4"PRId64" pts:%-7s pts_time:%s\n", inlink->frame_count_out, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &inlink->time_base)); s->print(ctx, "%s=%s\n", e->key, e->value); - while ((e = av_dict_get(*metadata, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL) { + while ((e = av_dict_iterate(*metadata, e)) != NULL) { s->print(ctx, "%s=%s\n", e->key, e->value); } } else if (e && e->value && (!s->value || (e->value && s->compare(s, e->value, s->value)))) { From patchwork Sat Nov 26 14:46:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39539 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6a11:561f:b0:33d:fc04:f431 with SMTP id rr31csp7374068pxb; Sat, 26 Nov 2022 06:48:44 -0800 (PST) X-Google-Smtp-Source: AA0mqf6SYqiD6gmdql3LmuZOG4vhjP3Rbt7MCzYAHH3QPjlKPXk2oehHOxkAYJc7iX9V1T+gFmb0 X-Received: by 2002:a17:907:d047:b0:7ba:530:223a with SMTP id vb7-20020a170907d04700b007ba0530223amr14756770ejc.215.1669474124800; Sat, 26 Nov 2022 06:48:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474124; cv=none; d=google.com; s=arc-20160816; b=l67YS+c5QoSYF/TdAmhsnPoBex2rgOxawgja4qYSpz8U+l6jFw3KG2FRUaJt6zl1dk EomMh+vwDebS+ydnES3W6nYkCCY58Q1omeEHYU+6M95g+EmovzowpW5SJTpYIMTO4qw3 MTIuNtdyvy7b32c6f0YG8bvNJnAMMscvPwnrh/9u9DLzlUeW/MsXBWTFlaBMIZN4jsL1 F6OclIIojv0VBNIKx19VZY1BKwwiBl2a8Da2L6teLtTLtM5fz7x8u/xleWPMvI5fS+wZ 6hA6DBPHcnIIJINGRZED3rapJenm6YwFX8MZNofCFZ4N/BTK8MKGX3saYjaxirB/zQe6 A/yg== 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=aim3s+A4ps2TrnUrVJ+N1KfMgFGpT8HIpVz5LrVCOU0=; b=QO3uIxZJpd+2veDEiunyw4qR/PrTcvdT3gRI34hHZf1hdJfdTvcR/EwEwAWM2jDp5W AmEOIxlqIgggJ651Q3QaHX22Vi4dvDDoR4sjaln1P+kopGnoTEI9P5o67DPQ7k1iaGIe 0OfTny272Dwi14c287Kljx75GRone3ySoCxmOPM1clesnF3H+XXkRvMtOrt4PG89SgRP C6Y6EiJvDSa4d+OuOsWp9hJ8wPeXVC8X5oRslHVhZ6nNsZhNlol1qS/j0rwenyzka8ss C8KyC0hD+KvSfzZpXM/2JZ/TMz6ZN+s8PkOt2oSJFJyFxvhB4GVLPGFeO5zKx3QzbnYn Ga1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=llmKUDG8; 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 d22-20020aa7d696000000b0046904a196b7si5508612edr.272.2022.11.26.06.48.44; Sat, 26 Nov 2022 06:48: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=llmKUDG8; 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 0A06568BBA5; Sat, 26 Nov 2022 16:47:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BE6C68B3E1 for ; Sat, 26 Nov 2022 16:47:09 +0200 (EET) Received: by mail-ej1-f52.google.com with SMTP id n20so16180332ejh.0 for ; Sat, 26 Nov 2022 06:47:09 -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=zzT1C9xStCn93ptLg62c7M0IXqAvZAoahmXbnBxNeOE=; b=llmKUDG8zbhjvzotzctsiFtfSiAKBrWG2/CsJ9ZdkeSVZKx465a1KbQ+hGtRofk8y2 JeDP2Sy3YBN4xkRTWMtd0t5r0tj0uVcutiyng6ZxkjmJ0on5EeAYgsNb/DnXjmZq/cg3 +7CbtbGKskDzCYVyWXBspA3REy2DQr40gED2woUZcKVkj5wbOkqjiMJULaXj56OoptT/ P0d5YdDNvX+cLFgKVMTJH1vE6RSCgakA2gfgVKN5RxFlHooqaIi1eWIKHVCm9UJLvuQQ MviI1TGy0VUEpnlymIV06SfZuI7l7YNovPi/Youpt7sdRJ+fjGHHoFXNQjCgF3NZO+Ew +Gvw== 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=zzT1C9xStCn93ptLg62c7M0IXqAvZAoahmXbnBxNeOE=; b=iqNJa8rJD0iMAIsov+zD2zGO8mIN7ukyzsmMxcBpKnzDZOVJoryi75WRQ2Gv/jrr1f HuDyXOG9oQHBjuAbEyqLgjEK4q2JYg16aGhJnYbP0PKLH9ANOwGwR4hGOoQSxUE8pTH0 dxaT9B2eG9jdN9/UC85z9IXHCgMveJH+GAf2Sq/1PjpaTNtEEkwgo4Lrkb1e50nEYdJg pJ67jM3Dpml4UJevAQQ5EOeNPLJfIEfnnc5z4bXXXLIAOO7dSO6TZYVzq4qqaQRz8UkC yPh7mc1KFlJ5K1qxdr5HEDBm3Qmj1VfCNnulqKorKl98/q4WL58yWn6y1oin062stX31 CTMg== X-Gm-Message-State: ANoB5pmfwqHhFmXaMX6AYe16cGA+bwimqQOEueqlIcl6dJsXTRVHQw0+ ECM9B7S/JgV/40oHuxGg258DsboQPTI= X-Received: by 2002:a17:906:edd2:b0:7bb:1424:b112 with SMTP id sb18-20020a170906edd200b007bb1424b112mr11991586ejb.168.1669474028563; Sat, 26 Nov 2022 06:47:08 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:08 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:32 +0100 Message-Id: <20221126144648.73162-16-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 15/31] avformat/cafenc: 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: +/+n92GN/Gmz Content-Length: 1716 --- libavformat/cafenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c index b90811d46f..b8317cd5ed 100644 --- a/libavformat/cafenc.c +++ b/libavformat/cafenc.c @@ -113,7 +113,7 @@ static int caf_write_header(AVFormatContext *s) AVIOContext *pb = s->pb; AVCodecParameters *par = s->streams[0]->codecpar; CAFContext *caf = s->priv_data; - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; unsigned int codec_tag = ff_codec_get_tag(ff_codec_caf_tags, par->codec_id); int64_t chunk_size = 0; int frame_size = par->frame_size, sample_rate = par->sample_rate; @@ -195,13 +195,13 @@ static int caf_write_header(AVFormatContext *s) ff_standardize_creation_time(s); if (av_dict_count(s->metadata)) { ffio_wfourcc(pb, "info"); //< Information chunk - while ((t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) { + while ((t = av_dict_iterate(s->metadata, t))) { chunk_size += strlen(t->key) + strlen(t->value) + 2; } avio_wb64(pb, chunk_size + 4); avio_wb32(pb, av_dict_count(s->metadata)); t = NULL; - while ((t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) { + while ((t = av_dict_iterate(s->metadata, t))) { avio_put_str(pb, t->key); avio_put_str(pb, t->value); } From patchwork Sat Nov 26 14:46:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39538 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6a11:561f:b0:33d:fc04:f431 with SMTP id rr31csp7374225pxb; Sat, 26 Nov 2022 06:49:00 -0800 (PST) X-Google-Smtp-Source: AA0mqf5nFoB4pEYbXVos97n4ErTc94HRkQbI7dGv6n2TMZFBo8eF/7Y6e9sOS6hYoTaZOKpK+2Wi X-Received: by 2002:a17:907:8d1a:b0:7ae:6ffe:a118 with SMTP id tc26-20020a1709078d1a00b007ae6ffea118mr36421431ejc.250.1669474140486; Sat, 26 Nov 2022 06:49:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474140; cv=none; d=google.com; s=arc-20160816; b=ew/IzEKpEubkOOt8fP3J9Cn/1dEU44ChxF1t4aICdhKlYV7WqeT+BwBnzpaexkjKXg 0wtEWhDCYsjQIhXHpkRzmgVKGSxZtW/K6ycaVpIsH0etuQ9QnhNM2dFnQlIsEQjkjWVb 63dtwzfeTeSy0wm/C8omf7OPG2RajyT5ev0JpSlIocHUaizbyWNOJBucBH7BEo3ddPdD rNI8x94JuzWi0pCryvyXX3D3lsOCR8jkyEr77vMxflo97xjp6tzZ3fB6FJsbIeMFkBUP KhLIItMe7tIiQn6My28b5zbMg2ktmT5vIObkXOYNc/sLiufe6/iWL3JZJL2AxOcD6/Xx KQ/A== 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=S4AJ2liv8qYju7RKBBSdCqr+JJrKIx0P3WYylmmAAs8=; b=B5Vckv7MaFNqKtDdLcE5pz2QnIjwB/hXykp/M0+zU01IlqFbOV7jeLSSjbSsRXALMm E0KE8q9CvgjnbkKVo1S82xNSoKmnNhW3MvyuG3+JEhjH7mwRwTHmtM9DdNXa/kODl5ft HeWOp/NkjJ2DZjkSAL2Hro2SLkVLj5+Kkc9PQcn6qpj1ZjlJ+mvCPkVZrG3hyBScT9eL YaUvHcq1+ifiy+eTI2HPWa2dC8xK9Le/aH4Cvkm1NqU/nE4DhnnWUrhx0yJ/Ss11iP/p ySA4kR2c2LWA+otx04ty215yRYmHdDKJEMOI9oH3aeH+vMobnqW3jGCzar2lXz5axTxQ k/GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Xj06VWf8; 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 j7-20020a05640211c700b00456964d3369si7345085edw.230.2022.11.26.06.49.00; Sat, 26 Nov 2022 06:49:00 -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=Xj06VWf8; 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 4D5B368BBF9; Sat, 26 Nov 2022 16:47:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC96368BA2D for ; Sat, 26 Nov 2022 16:47:09 +0200 (EET) Received: by mail-ej1-f41.google.com with SMTP id kt23so16071168ejc.7 for ; Sat, 26 Nov 2022 06:47:09 -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=9vKV3+HvVl/SXzb249JoWcf5XE3eJrfVPLNFa5fLbHk=; b=Xj06VWf8RVn9WDtGKERCo1ajgOiY0jmj8UEvZTfMEG/YjCO1hpXjVBeoHIp7zpVRpU q3rymprRi3PqXy7pxCfR22yUtfJzinhn1/0SmP+J4HMpBBWADTi9mtmQwp0stPHugGf6 WrdpRLgGnz1VaUTVhzdB5dgM7avcQqXXmroLgh7W8LaRkr6TiZaz0FFvGPJMKOjUT+B6 NOm28X/qGlfOCRxV3q4lz3N6nqtWpf6yfsOMKrUBfGlY2yO43g7SmDclXgYq7QY5vbJ0 0iL7UQG+Q64gnwZI2eIOZkP1il/9ajLhpteWphWMdkarNIl19hjWGE2WQxNlTkSNcMLs oSHw== 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=9vKV3+HvVl/SXzb249JoWcf5XE3eJrfVPLNFa5fLbHk=; b=jeAMYwEImVNqt2wIqfjtqNmW9tKXr0VOQPoDrHW7J1OtaUjFzmXuLtAetGIf4kMfS4 /U3xOGEFnW6r0c5e6vxwaVODf9WV7Pwqj31LsB+G8FZ5IksXUrKr09rfrpBghbOLAVik OXfK2uwuYL8lRMuHoJjjj0XhP1lVW2T67tqik+XwvDrYz3XA1BCydGxEho3itgZhHPAZ 42RTQKWBDUjEoVtqdShYo20zRCljMcHYo7OI7G2WS1v+b3h1HZOTSaRap2/Eumlxz3se gpkTpGqbSznQVPY3H5WoWzuohkkEaLwhEn44klmdmTmnxojHACjDMfB/GQJ68Io43QKl jBqQ== X-Gm-Message-State: ANoB5pkRxCdNISK8r0HsuxReoit3I93sv8tcZu9i+LsT9HYe3LresGxg h4lvw7O2WUqBpW7skS49TMhrkvzx4Z8= X-Received: by 2002:a17:906:3fce:b0:7ad:bb54:75d3 with SMTP id k14-20020a1709063fce00b007adbb5475d3mr36150409ejj.484.1669474029296; Sat, 26 Nov 2022 06:47:09 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:08 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:33 +0100 Message-Id: <20221126144648.73162-17-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 16/31] doc/examples/metadata: 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: S7V5HgFnLlNh Content-Length: 837 --- doc/examples/metadata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/examples/metadata.c b/doc/examples/metadata.c index 7c44009a24..734b12df16 100644 --- a/doc/examples/metadata.c +++ b/doc/examples/metadata.c @@ -52,7 +52,7 @@ int main (int argc, char **argv) return ret; } - while ((tag = av_dict_get(fmt_ctx->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) + while ((tag = av_dict_iterate(fmt_ctx->metadata, tag))) printf("%s=%s\n", tag->key, tag->value); avformat_close_input(&fmt_ctx); From patchwork Sat Nov 26 14:46: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: 39534 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6a11:561f:b0:33d:fc04:f431 with SMTP id rr31csp7374391pxb; Sat, 26 Nov 2022 06:49:17 -0800 (PST) X-Google-Smtp-Source: AA0mqf6mC/8HEFdvMfqHc3Ep70CDJ2IX26c2Y5AqKrhHM8LqnYYetk9n4KsECYaf/TM4yHAomGs1 X-Received: by 2002:a05:6402:d6a:b0:467:6dbf:e3e8 with SMTP id ec42-20020a0564020d6a00b004676dbfe3e8mr1744708edb.291.1669474156929; Sat, 26 Nov 2022 06:49:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474156; cv=none; d=google.com; s=arc-20160816; b=rvHDLLn8eVA1Cf3upt3MdhpeQN94W7cZ8xE1ajXAniCRO7rHDAQgZ5Hlc6YHL0JUP1 CDXBzsQJlG4wyU9BRgbUjjnnh0Sxy7uJktIV7KRrRArNlT+ZZbHl1pT9nE5Vxd2Xb8Pn kxyCdLoL07eb6/yiwL2ov7qGt8b1Xh64Go6liGyx6E4QK3pXxzL1jMkuqOrQ2JoJKaoW ZbI9g+sufcyFrjS4/mSnxoVsyt5NyIAZDH5zK+jyz17idlNpmMTJacXIqDR3RPoE1I9w 4hW7dPxuQI5gXiQDjOuUe08JiLavzSDqDUAlWc+8eGRl/GVmYBbpVqTtMaS3KB4wPmIp cRXQ== 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=B/bIK/veN2wLXjcNazkGzm8hS+Wxije2mHcPwrI9+eg=; b=IWSKlSJQei+XcOk3mWAW4r8grcuLH3PtvMh8Jl22v2XPPa9X4swgE+zX+kMs74/ijZ KLMBx9Ix2T1l+zMPHO2d4c4wNbDyMVPrVDXB4d3+GVU4uykqPUblXOA5Lq+epfPl5zaz D2qxnHapgQlLdbU+ACQN7/7jKRtEhnNSRZO/FGdlNZksQHnlw+R+KohQAp3N9ta6YwFC lRZp6ZjBR2FtFzsprozg4/aPNLA1y6Pn0tqmmVChPu3mo2R/L8hchZn4J1X4RLwumZnJ Ru4nVaJUCH1mToxOLGSUByydJX9lkZ2LAvBKYEX49MPWJVCY9PC2C18FXqlIT7jjsfNc 7Akw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Uh6ov5Xj; 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 qw14-20020a1709066a0e00b007806c141214si5036085ejc.153.2022.11.26.06.49.16; Sat, 26 Nov 2022 06:49:16 -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=Uh6ov5Xj; 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 5638568BC3B; Sat, 26 Nov 2022 16:47:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C88E268BB66 for ; Sat, 26 Nov 2022 16:47:10 +0200 (EET) Received: by mail-ej1-f49.google.com with SMTP id ha10so16123416ejb.3 for ; Sat, 26 Nov 2022 06:47:10 -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=itn+euwLExplmMk+QaeoQzEnn8eZwdG0yrFUBRgD2v4=; b=Uh6ov5XjH2hFdHC/o6Aq2AMRxM2zj++2WXHH29denJWsMURR3wFEq8zNTOPpWeMC7i 60fug29bnGrazkJqjXtOB/pm3ha5JnbapzMvYuz91rI+zesGPQ1f2+ej0z2JHh+K1UFb uJceblfy0LqVUU7Hue83CpXpsKOzaC7gnWWPkc/4tfO49EzOWAMtafKMz16B7xmzfZiA VIinSv9O3X7dlqoWfqzZZadjZdXaASfsHXNNizL9s3NW07B7GbLRX5EtpyOr92Tc6vA5 OMMuntmTdeaZYuv7E/w00v/SpxsRK8K/AEeAwL5gHYsq7zL56jjyYkxSmyTNmQAmlw/8 kQcA== 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=itn+euwLExplmMk+QaeoQzEnn8eZwdG0yrFUBRgD2v4=; b=AZPafZ4o/JVW5/ai2s5AQkaOyOYSeSXXVYE6UctffbKWetn0O5G22C5Er87l7GKbSu DGSX2ZzjkAih8MEudQu1ujZE3b/g44pATxLCLoDGpmKzRq1dqOESzHFvLT3k6fqFb4o2 oCRtXGykOByClcdTh9H2jDoAALEOSSYh7YoYrv93B6OEvAfmT2/7WL1tjmPye3RB9BOj WnU4fB9JBvZtTqiOd7zrusU4iqe4UxD6af8r7LYFNgQMRIS/laDMuUVPtt+Syu8S+ICA w+9Fptv8AzdyvhKZH5pagW5/f+HIy2JfNZfFT0//Wxb101BQhkExz4QthHpOVoVzbB5X pWpw== X-Gm-Message-State: ANoB5pnK/CZJiouPYfNsi4R8GbRVKxFuAXPIlPZyqasOiHXcZVFqZ1gb iGBAdDw6mCHgbe66+RD8jr4KXtOaSwM= X-Received: by 2002:a17:906:1484:b0:7ae:6746:f270 with SMTP id x4-20020a170906148400b007ae6746f270mr23673266ejc.728.1669474029954; Sat, 26 Nov 2022 06:47:09 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:09 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:34 +0100 Message-Id: <20221126144648.73162-18-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 17/31] avformat/movenc: 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: zMRQ2O7e7aYy Content-Length: 2011 --- libavformat/movenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 064b541972..7b00e65cdd 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4110,7 +4110,7 @@ static int mov_write_mdta_hdlr_tag(AVIOContext *pb, MOVMuxContext *mov, static int mov_write_mdta_keys_tag(AVIOContext *pb, MOVMuxContext *mov, AVFormatContext *s) { - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; int64_t pos = avio_tell(pb); int64_t curpos, entry_pos; int count = 0; @@ -4121,7 +4121,7 @@ static int mov_write_mdta_keys_tag(AVIOContext *pb, MOVMuxContext *mov, entry_pos = avio_tell(pb); avio_wb32(pb, 0); /* entry count */ - while (t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX)) { + while (t = av_dict_iterate(s->metadata, t)) { size_t key_len = strlen(t->key); avio_wb32(pb, key_len + 8); ffio_wfourcc(pb, "mdta"); @@ -4139,14 +4139,14 @@ static int mov_write_mdta_keys_tag(AVIOContext *pb, MOVMuxContext *mov, static int mov_write_mdta_ilst_tag(AVIOContext *pb, MOVMuxContext *mov, AVFormatContext *s) { - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; int64_t pos = avio_tell(pb); int count = 1; /* keys are 1-index based */ avio_wb32(pb, 0); /* size */ ffio_wfourcc(pb, "ilst"); - while (t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX)) { + while (t = av_dict_iterate(s->metadata, t)) { int64_t entry_pos = avio_tell(pb); avio_wb32(pb, 0); /* size */ avio_wb32(pb, count); /* key */ From patchwork Sat Nov 26 14:46:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39541 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6a11:561f:b0:33d:fc04:f431 with SMTP id rr31csp7374576pxb; Sat, 26 Nov 2022 06:49:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf5b8fElf2cy3nbOtTidN82Bjxpv50DH1DXM6ha4ZvY5JmerAGukn4RPuuoOt7tzAlmP/6G8 X-Received: by 2002:a05:6402:520a:b0:459:4c7b:e852 with SMTP id s10-20020a056402520a00b004594c7be852mr28036039edd.347.1669474173649; Sat, 26 Nov 2022 06:49:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474173; cv=none; d=google.com; s=arc-20160816; b=LPK3SaxZunUDBRwkRlO8i3ufHKZfrO/RbD8UZYwWavhopq+yAKpWUKwgxvMH7SmCK+ 33xkstO4ceC6u2j1wwO9wnBLHs5n79Pz5EQijS365mEjNtAk5xkjp0iBC6r33V6Cb8Km L6g4EM6DwuAjjUgqVAQSlpu3TJxau+R+/TwMRnq81Jp0qkDcbC9j3c3RkIuGb3WMzd7F DmPXWx37Ic/2QDwg4WJfWiwNOAy3ogx58w5c7cj41McrkmrZXsyQDpdXzgMW1LXV4ozi 8A0eWF3btXWRt8Q/xRnIurvLkHgNZUHQIyuPKxGbx9xMCB4yK7jv9AgrN/ooUMqj5wsT 1NPg== 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=Wnq2VwfVjDspINCfrh4u3ksBhJvXzJp78fgoAH3XpeE=; b=QgxrbYG7MCJER6hWTGLJoTo2hNogxT/STQ5Mi3exnhXXOPsrR/KjBp4Gp28rZu4y/l COUL+Geg84PRB3Vt6nJAxdfOTvEcgrivqkLJdZqaNO+YJJJ5f7TFEgdm0rUK5wEVLTya 2w5wmfR1ZTjzKngqpirVe482mrhWJszytQTkpgRXgvS+MO1tblsTIMgzcHdPO2UW/dBT azVHWt5EI6cDonMV6Xw60Wzoy60jrCYKIX0fcPsBEKmmwQIt++ilMqgGidSN5YQUSXOY idky0yXegsFknZUxEzhqeBhDCDwpcdYh+a54BXejsCQmaoI0YEyzJ4TridKUvsH/JGEh 9mSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="Hax7/2a7"; 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 dd11-20020a1709069b8b00b007af15567a5bsi6521465ejc.432.2022.11.26.06.49.33; Sat, 26 Nov 2022 06:49:33 -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="Hax7/2a7"; 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 51DE068BB3E; Sat, 26 Nov 2022 16:47:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C41C68BAC7 for ; Sat, 26 Nov 2022 16:47:11 +0200 (EET) Received: by mail-ed1-f54.google.com with SMTP id z20so9868068edc.13 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=NJufz4NJaHmMwJDZEV1aFBRizUd/ZI9ltOt8Syw4F24=; b=Hax7/2a7JBeFeUDfwTNh5YJ+vO9TY4CmOXoK+s9X38qGwTw+trOpWjn3Ze7oKr/Sh9 8v5lKRcFTRwlluBue0ocpprq8tLAw2Z2paboojKp6cHONqpHuyKF6tmGHQ/uWAdi8GRi 0TKSaZSpvV2hPcJmMyP8ODBs046+B9XmcH6jlOrP6Oy2i/jPO87mNiPEQmJMCNCu+yZy hFlBdBdxl9Mpm9C8yI9QcGh6ndPgSwTErssLixsFGLT+t9x0AxqqwAOt4r69GHwunBG4 774PC16wkTlhTNCgGnWXQG9rJEZYcRYofy233NAncH6erwYUnUcaOKn1+eRdr9rOg29M 8O9Q== 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=NJufz4NJaHmMwJDZEV1aFBRizUd/ZI9ltOt8Syw4F24=; b=zAYx97dXh9+jWPuSKsyactpACRhr7cyqcej8p31RQqSF+br5uLU6fmCze7vYYtE3gW CM1nFjtrcXtghdatUTzxMz8et2IOhU9SgBFyxM6JaSLpiuTLrYJkQzEEqhJNt5DYXn5y w6TYUq+RkHLGBuZ36kI3l78NchZqja179JIBFpzZ6nZ40rVLP4EWLhUQUiKF7b9lz8IW BkTRkpYRU0egJNL3JUr4PZYB7bJ+Ktqo70xbP5OYQfTOnlzbioz2Izrzf9jnbivjEJoy 7vEUcmVFYhecHCDFYSzfHF6j1u0po50psZEVzDQvRBlnenTW5aGL1Yac6fq4aurpsHQv r8Sg== X-Gm-Message-State: ANoB5plkxNo87jhG5AaU8+4uHF43lYcaSVPUVUgBykqAhae3nLLIZSYN FZEN5/Pl9J5rwHG+PeIVji2QlzGWe1M= X-Received: by 2002:aa7:c78b:0:b0:467:97e4:6339 with SMTP id n11-20020aa7c78b000000b0046797e46339mr40182568eds.381.1669474030659; Sat, 26 Nov 2022 06:47:10 -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:10 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:35 +0100 Message-Id: <20221126144648.73162-19-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 18/31] avformat/metadata: 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: zrWc06G0nwCE Content-Length: 1204 --- libavformat/metadata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/metadata.c b/libavformat/metadata.c index b9b6de7972..a0258ea125 100644 --- a/libavformat/metadata.c +++ b/libavformat/metadata.c @@ -29,14 +29,14 @@ void ff_metadata_conv(AVDictionary **pm, const AVMetadataConv *d_conv, /* TODO: use binary search to look up the two conversion tables if the tables are getting big enough that it would matter speed wise */ const AVMetadataConv *sc, *dc; - AVDictionaryEntry *mtag = NULL; + const AVDictionaryEntry *mtag = NULL; AVDictionary *dst = NULL; const char *key; if (d_conv == s_conv || !pm) return; - while ((mtag = av_dict_get(*pm, "", mtag, AV_DICT_IGNORE_SUFFIX))) { + while ((mtag = av_dict_iterate(*pm, mtag))) { key = mtag->key; if (s_conv) for (sc=s_conv; sc->native; sc++) 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") From patchwork Sat Nov 26 14:46:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39475 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6218705pzb; Sat, 26 Nov 2022 06:49:53 -0800 (PST) X-Google-Smtp-Source: AA0mqf4Y5cL2zPqJ3uRHsEdmjC6p9mOHz3/9b3iunIQEsOaEREolkCpDCPSW8kqMLLsyB0YzNboZ X-Received: by 2002:a17:906:a58:b0:7ad:b45c:dbca with SMTP id x24-20020a1709060a5800b007adb45cdbcamr25391745ejf.388.1669474192833; Sat, 26 Nov 2022 06:49:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474192; cv=none; d=google.com; s=arc-20160816; b=oo1xeqHqUCb8uP1y8ccygv1t2ioQxMgdNzQDJ+XFOo99qExODrOb3JLOMZZzAs8Gpf lxWLJ9vGneVPoqk85EeQkc8b4BD3QCmcVFkmc/xPZf8abDiZ0VJUY4x3uIUTxlxHL3om fe2Izr3H7abJwvse+JzjAHT9Y8JT74ZOYvzPQgWf4qEqym5aSVjvEqC7/49oNoEkiu/q 28e75zM0ruOeyYcFlQuCK0PEujbzWs6/c6BtHvI6gCMFrJK5aUby15ARLEDyHPu195xl sR6p5UOmQR9NMxYmXSP1AlniAUXe0Xj90hl+MzNuGpwgjXCKW2i7Ltj8iek/BwR8coP8 vPAw== 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=s8e2gL7Z29f+Y2qF0V16dyW7yoToqDD9xhpvILojC98=; b=U7JUz+AVqR2p2Mb29A6Vdg/rMwqtTkZ7DiziMQg+tbMQWzfyjJWwcTKAFLQWc4Ejog 0qJuleQRumOlHi4jGo/2v1+nbaq33sj1MZ3tHhLn8lMJltWEQIhf1nciWiVk7vKH3pZH FEqQNHkz9EMkNn2+zwXrrjGuiYOjvu3RaEobM6KgQVr+MbJv5P7nejk8ZHmbVLo/kB0L 2Cg/PXW86U9/5vY1AFg5PrQPBezAx2iOh7LF8O+UQVCkGEd0lRZH1X6NmjrwzLPqovdE g+H4rURVBGuAz2uBWCBt1XCTZs456j/MPEOwali6p7pb7MBhwwDLf3Ue+aTneoB2ocBv 84Dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=FktcGiRF; 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 sg33-20020a170907a42100b00779a3220c5asi6300338ejc.343.2022.11.26.06.49.52; Sat, 26 Nov 2022 06:49:52 -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=FktcGiRF; 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 8312768BC69; Sat, 26 Nov 2022 16:47:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5863D68BBCD for ; Sat, 26 Nov 2022 16:47:12 +0200 (EET) Received: by mail-ed1-f54.google.com with SMTP id z18so9861518edb.9 for ; Sat, 26 Nov 2022 06:47:12 -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=fUNUi65vhjY3XsjjiMDMEIss5wk4XG/e60tkD6AkBfk=; b=FktcGiRFE/mjePXsIkqdr/E4YETz3OVWVkr9dulzxsvgD+NojXsnC5faYNWFuO5R2h OP2kvBms6HMNKVhv4NSNgqO/JCDqqvrQ5Bre4Ym72vGMnE43G+haHprViuWQT8/O5Ll+ tCfgDI4vuSiXDsftLBKsAy3EJH7bO44UnrGqOZvJwJMNZk5evcwva5ooo2neJR0wMf6q HvmmHDnN7vpC98zEcnrFeb8NfS8FxUqy3dE399fLtPGzKEI65NabCmFRKV8/fn/bNH63 WZ6fyWrSFosJHcBzQNJe8wBDRkPWv8NAw+gH0J+3j1J0mMgbWCJJaKLrFJ6DixyQypo3 +w5w== 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=fUNUi65vhjY3XsjjiMDMEIss5wk4XG/e60tkD6AkBfk=; b=kShG5cWAb7y4fWHa4iUBlIYjNnHa1tHpOxj2R0XxkHEcVeC1aLPw5bFow/LOpkV2QC oAGB3QBWF1g9D4aLUL9t2cx3Iqir/hb7942oy3kc0ES6A7bTWTNIyKQQjPEvjru73lzv CI8IJylAj93WtT6BvxAFNcH5qBb1rxdUkfzCTM1s066pYuWIyt9aFuKbNKi9WoQJXBYF g0ATizbRJju8/KUAtyW39O3RRu0+V9aZuo5rlagcHLiODd/xt+vb+9h2TInt76wYqv14 NsrN0QwB8u5ieTH88g7MEcJn5C/xTVGrSpkNj22YF5BPq+frROzSVRSDpVpoIzgC7HVW 4ZRA== X-Gm-Message-State: ANoB5ple4PNxHpxQ1Wb4DzaujQxDFF4wxdaFqXULp3yfQ2y3LKYQuBiI yh5tBYdelyaLA4EjmbXn7RVtJCFoc7w= X-Received: by 2002:a05:6402:2067:b0:46a:2378:445 with SMTP id bd7-20020a056402206700b0046a23780445mr19189007edb.221.1669474032060; Sat, 26 Nov 2022 06:47: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 ay10-20020a056402202a00b00461cdda400esm3107745edb.4.2022.11.26.06.47.11 (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:37 +0100 Message-Id: <20221126144648.73162-21-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 20/31] avformat/hls: 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: G3ikF1/bju/b And constify oldentry too while at it. --- libavformat/hls.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 402eb2b5a0..926d053939 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1104,10 +1104,10 @@ static void parse_id3(AVFormatContext *s, AVIOContext *pb, static int id3_has_changed_values(struct playlist *pls, AVDictionary *metadata, ID3v2ExtraMetaAPIC *apic) { - AVDictionaryEntry *entry = NULL; - AVDictionaryEntry *oldentry; + const AVDictionaryEntry *entry = NULL; + const AVDictionaryEntry *oldentry; /* check that no keys have changed values */ - while ((entry = av_dict_get(metadata, "", entry, AV_DICT_IGNORE_SUFFIX))) { + while ((entry = av_dict_iterate(metadata, entry))) { oldentry = av_dict_get(pls->id3_initial, entry->key, NULL, AV_DICT_MATCH_CASE); if (!oldentry || strcmp(oldentry->value, entry->value) != 0) return 1; From patchwork Sat Nov 26 14:46:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39476 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6218785pzb; Sat, 26 Nov 2022 06:50:01 -0800 (PST) X-Google-Smtp-Source: AA0mqf70MgfeOUl0wTbvd416t2KCTH/JVo7jDZiEZg2gDUJOXnc41i0AyO3CI4oRgVGH+KgaoYlZ X-Received: by 2002:a17:907:601d:b0:78d:4abe:c4b6 with SMTP id fs29-20020a170907601d00b0078d4abec4b6mr20608861ejc.485.1669474201115; Sat, 26 Nov 2022 06:50:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474201; cv=none; d=google.com; s=arc-20160816; b=FyZ3sKiVVV3DHil5CvNJ6A9+UTf1ftgX8qqDDn0EiXn1X3DQIVYGL2xDmrCIj+l8Nm BTuzDHg3yukkt+VB/L7rlRfMuzufSR7FDwlOSk8F8xY2RfVDF+2f2MKq2QbklpifdDu6 YWRPDjmhAbtzORAZJxUjDIqzQYyIKPzplEnWKUq7UjrUvXk29/rzb70Nab966djTc4i4 9b9vZXtIQ8ApM89qjsiM10lWijCQMOPHBjnNwYG8lBKKLhugGIj23uJgjudrvRmem9J5 fBSub2dSQuR3QTkuhoGn3n9Cj8SH7/6jI2wsR3SDY/Ml0rskakD6XT/hGWlqRSuNgAm9 WWwQ== 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=A9OmbscLpHI56XjER8IXGQYWZ/Dkuu7S4VKrRgXJBdk=; b=ndwIeqJQfgOAbpqxptruBEqn3w0KRoNrRUIjvYHU08x6CK1ShAC9S0+dhxTlQVCrEh miGGxf4aalpEQP8FI7Bf9yPAD9ZpCCYEnjbEnBRDVVob/C6258ieMTPTcqx6BjrWIEis 8p6BK5qT3rP46NqG9EOD++AoC6ROFeGKiLI1iPHN7F7bea3+9KyStPMAXbdZQwnq5nxE hH05K4XZrc5sk+HDKYC8R9aCqmJobbqd4wpqFre6/X4ClbZ27qeB64UXcSe4bM9LZyRh ggQH2bGhQkTIe7p3XgbyW0CXMjogPXO0zLydUmWBavAF5ayYGS84EZCYRpoLfxAVc6eJ +EMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="FAV1oo/x"; 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 ht20-20020a170907609400b0079800b8172bsi6643989ejc.450.2022.11.26.06.50.00; Sat, 26 Nov 2022 06:50:01 -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="FAV1oo/x"; 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 4498868BC72; Sat, 26 Nov 2022 16:47:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4821368BBCB for ; Sat, 26 Nov 2022 16:47:13 +0200 (EET) Received: by mail-ej1-f45.google.com with SMTP id cw8so5962532ejb.10 for ; Sat, 26 Nov 2022 06:47: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=JS8mTXhWnFdcu9CLSlxzuCNSAEWmh5OLpInzpyBMpk8=; b=FAV1oo/xZYesPnex8ZjBF4RkBG+pujKhvxbY4TdXcUPQIyaPjxEUVNOK36+d4WLWzG Q3vo2ZxY844hlw4yO8i9sIdKTb+avww9WxkHpE90QMftKfsZ5YaUZVxdC2HhIQFExtxf gnCaq7z72c9LC8sBgmvSyFMC9nLC6SXYpAlxQp5xbM10nwYx+PttRZl76EC6sSifKO4/ YMHC0HcMmOXbsLxuYdKi0JRNSe/63iwjGaZ5el36XsnWKbfpzHjTUMZEFlMC+cG7rH63 lm+guwvhtKW8uPt71IXLJuYvZfD2jkLCe6LLnb0a9NPoLnWs0kDOeRxZsUIVXZbQYaBu jjmA== 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=JS8mTXhWnFdcu9CLSlxzuCNSAEWmh5OLpInzpyBMpk8=; b=6rsTF4JFBT9CWA9AmUY3KRU+8urdgceK+O5RucfvJIfM7mD909MaIHlgLfSObYB901 u1fcCvPR2P9CLVowz6V8Z8oXM3UY3vfbN8nOW2EyV04lO1TNqUrLi38QBfCa21sJ2uGM epgDLssY/JttEiFSamzeCC2h+1zrtuMfeYOMpoL3KmkZgRkjyoAsfojw68HxaEnFRggS qVQ+vDK6SIolDoytqUgwpQVmJSKPU51GsSldZ+Q83Pk24Vbs2FXGXTZuEZMq4Qh37fet jg89Cfk1OPHW/JmHgAKRrdhwGMmqO2Hgf9EJCnUQXuuO9noBFzFRLlJ7fyp0CL2x5uMy 2o+w== X-Gm-Message-State: ANoB5plMHrNUS93NSCHO2JIOIKuhUxpeeUyb12vKp2OaQw3s4F/3L63U UoqdsUA7v1wyEUUWixzZ9jzIT+Lbq3I= X-Received: by 2002:a17:906:198d:b0:7a5:f8a5:6f84 with SMTP id g13-20020a170906198d00b007a5f8a56f84mr19098581ejd.569.1669474032733; Sat, 26 Nov 2022 06:47: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 ay10-20020a056402202a00b00461cdda400esm3107745edb.4.2022.11.26.06.47.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:12 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:38 +0100 Message-Id: <20221126144648.73162-22-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 21/31] avformat/lrcenc: 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: TVa85zO3kHaO --- libavformat/lrcenc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/lrcenc.c b/libavformat/lrcenc.c index f7a5a6982d..2d6ca33e38 100644 --- a/libavformat/lrcenc.c +++ b/libavformat/lrcenc.c @@ -63,8 +63,7 @@ static int lrc_write_header(AVFormatContext *s) av_dict_set(&s->metadata, "ve", NULL, 0); } for(metadata_item = NULL; - (metadata_item = av_dict_get(s->metadata, "", metadata_item, - AV_DICT_IGNORE_SUFFIX));) { + (metadata_item = av_dict_iterate(s->metadata, metadata_item));) { char *delim; if(!metadata_item->value[0]) { continue; From patchwork Sat Nov 26 14:46:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39477 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6218876pzb; Sat, 26 Nov 2022 06:50:09 -0800 (PST) X-Google-Smtp-Source: AA0mqf4cCDzwWR1QkfeczImhhm/iIZxv/C5z8T/Qi/g1bWXvFhFc0KRb8jJIfcdNWLQ5N1OtfI8X X-Received: by 2002:a05:6402:4020:b0:461:9d22:348d with SMTP id d32-20020a056402402000b004619d22348dmr39745106eda.76.1669474209741; Sat, 26 Nov 2022 06:50:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474209; cv=none; d=google.com; s=arc-20160816; b=Kx1vWysIo9S+3VGTtcSw8bcaqGhKtVDmNxDRbOXGoUlH0kj/KmEKxMFfEK5U/Ts4+l INjYageZfKUT3WOIh81/gQo5GJBNtskTrcVfpowaVqKeVm2mNMmRgm+/1Govkqmfaj8F ZJFh040g4/CbxFzLdFRi2Xd0rv17j2mNvXZi+eco1ElzJxf0DT7RJNxN0fxV/LgiX5bU kf+ZU/Lwl7Zk6UUdjNlzOcXaNAOKiMmqbw+aAmbo6BJClT3NHJYI1ytPaRQ2Wj5ugH5L i1N1rS9n/rM4AY8yly1gZbf5rivgY+Cc2BgeNHQ+EjjxX4RQ1qgbQRpUjy+Z7qc5HR6r HIvA== 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=DZG9lfKMXmAVEAVsXZWKOaeT/6CtxmUFRlZVARzzX9U=; b=LIV7yI5jJxzjk4kAy9BGw0YYZ98S1yBZksdw2bsJRzstDSHk+LZVY//RED8lYu6Cdr QaFwgVdXgH2LE8KCDSnu1hJd0k7HbSSXP2ytrMqFCQy86ePbZEmNQ/GwYNWu0LQdc7u4 DesNl/GWmGFSMdNGFy2dBHreuAQvCWv7omUzf2cEBO6pgWL8UjL1VuxlkjzBRTrG+E9D oc1vJdSL+zxsKGq8NfQy8GGSB4QtCHbxR946gS/q1ZVvmO6wV1pAJpNZ6fYcdBUKT1wm 0D9Nj2IDjpc6jK1E/asrJNcbDgbV2Z5BN5nAqd+pj91/L3VaFfO71P4OBgD6vdbcnyVU 5ljQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=czLmbJBh; 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 c11-20020a056402158b00b0046ae9e1bacesi1731417edv.604.2022.11.26.06.50.09; Sat, 26 Nov 2022 06:50:09 -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=czLmbJBh; 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 04CAC68BC6E; Sat, 26 Nov 2022 16:47:27 +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 E01B568BBCC for ; Sat, 26 Nov 2022 16:47:13 +0200 (EET) Received: by mail-ej1-f50.google.com with SMTP id i10so16072310ejg.6 for ; Sat, 26 Nov 2022 06:47: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=EaUBJ+VPjTUNdhAdkRSHZgEjigw++QPR0Do57qj+Hkw=; b=czLmbJBh2wJkflaknL7BoBtzwgZ1eqhRkf1dsNOA9m1vtzjBMeqsh/rotG8cG0HKxh aOtF0azTOYMVQM90+ZbHmhm4vA+Z2hg6Fp4F/iMV5XpqPn/KfFUIJU7na08r/sOdUHdd T7RARMomPNuuzr4lW6bE1mV+7oNT1hd7SRvCZi2PP/F1GTjuM1tXwncOGjN54uQlCJiw OEw9cKFuMsXtE1abaiWF0Oqxl2mCamWnvzlSdd9/sI2ZlhpYRJAH28IXw5dOjnqp0LET FsZ8BXIOstW7f1xFK4rYqw+yfItWMeVnfvP5zpb44XEjoieykYmbm4iMqKfwio29ulrj Yg8g== 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=EaUBJ+VPjTUNdhAdkRSHZgEjigw++QPR0Do57qj+Hkw=; b=meaBJRcF15XBmSO0etp6zMh23Rn7PnidNz7i50x0+r50j+tPmcjONhM7qApuu1tmiJ +9SzPAee9nWPUYdRClJx+PUx2pRxepCDUvtcTftCU74dcUW8MMq8SR4QvBgszCqXid5X MARyupWG4K6FBf+aLxx7oMVyxcOwxdmJ5jNhrCffZa/GiSf/u8aw58tDP8/j/9b2nS4z O4+Dj0G3qvUFFV/pRlFQYZ42k9B1NtNO4d0xs7vaZgTpuSzj/nHOBCr6eRTYKY/qdI9v MNtECHLqFHBnVvqLAsVdTW4/1rNl1+xt/eiWXC7yJ5kjb/GqP/67uRe2qzIfsYrErPb6 fsHg== X-Gm-Message-State: ANoB5pk4TxXz+REcriTUN+V9Ywxxbeaab8BVST+1mr0v699kfC7I/urG B7uqgbcmLnQxq8I+DXMM3aK9mKZ7Xro= X-Received: by 2002:a17:907:9951:b0:7b2:7e7a:11c1 with SMTP id kl17-20020a170907995100b007b27e7a11c1mr21137193ejc.684.1669474033450; Sat, 26 Nov 2022 06:47:13 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:13 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:39 +0100 Message-Id: <20221126144648.73162-23-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 22/31] avformat/dump: 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: qNzdmqYRUOLD --- libavformat/dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dump.c b/libavformat/dump.c index 225f80ac22..d31e4c2ec6 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -140,7 +140,7 @@ static void dump_metadata(void *ctx, const AVDictionary *m, const char *indent) const AVDictionaryEntry *tag = NULL; av_log(ctx, AV_LOG_INFO, "%sMetadata:\n", indent); - while ((tag = av_dict_get(m, "", tag, AV_DICT_IGNORE_SUFFIX))) + while ((tag = av_dict_iterate(m, tag))) if (strcmp("language", tag->key)) { const char *p = tag->value; av_log(ctx, AV_LOG_INFO, From patchwork Sat Nov 26 14:46:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39478 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6218955pzb; Sat, 26 Nov 2022 06:50:18 -0800 (PST) X-Google-Smtp-Source: AA0mqf5kKiePbpj7dkylMggHnJ8eRrwTvfIKFPDnPCedT8ITBSDfthl6udsMrmNHEeUwySm7rbQ/ X-Received: by 2002:a17:907:767a:b0:7ad:e518:13fd with SMTP id kk26-20020a170907767a00b007ade51813fdmr36843458ejc.323.1669474218136; Sat, 26 Nov 2022 06:50:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474218; cv=none; d=google.com; s=arc-20160816; b=L9l0xlPQKG56+ZesthjG3Afie19HQc/lAEEA/2t0D9JinQUwzcyZvBtL20VL0Hqmn5 +q7R0thbsB8j9kSHwgPmwQbweBagle8de4TQp9LgYsXhWpBzLm5Rg5qUsHBkBQ9p0XqL u3LfGvR7dhKsY3guK2We7bylRJyzohkApxsdl+C9/h6207iu7a8S13PUT507FUlwjtJu W0zyRtaLugD9THFlGEThoZQi1y8Nnw/X55FbpWtOrTI++Le26JOGLrAp3aQ9kq2qBj8C 0fT/sZQsleguH1re8C5cCjqG+oR+VK4L9HTE6JlBK/CBsVg11n6b2VxX9XHS+xYUPsxB SpeQ== 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=YPa8vCOR7DYaY/1CYpol0x5z1jItcc7li2/6OzE998M=; b=XfE7wEXfX9lI7o+X9Ru4vqcCnk9sPq8LTzHpBsr4ziSPElP61CIh84ujexWKqGL1ue o0tjZ5isoyGiLVBFGGrv9bkZtZKAQ30Qen+CudECgTETLHqfaxwhNK4JXXS4RL8l7LTs 0moGcgOsQSlwpeIS+dIQ+IkRMH12FFwR0kk5zepUTQObOWgxq8VY5srQMO2Kzkcx2VBg CI+KBCWxl4vJ7ueCaMwTBn6pcGZrotegwDfOzwBzNbiZ+WZ6vyMlk3S1Lftu72+RSzDi zC8C617pAyL6Eqp1JO9/VyGYRlsDHV1Q9bXhxTUOcOF9Cuww2rOrvdXlG2EAv6RYFAYx VIHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="HG+UlO/L"; 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 fd2-20020a056402388200b0046af62544a0si1092174edb.401.2022.11.26.06.50.17; Sat, 26 Nov 2022 06:50:18 -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="HG+UlO/L"; 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 E7DC168BC86; Sat, 26 Nov 2022 16:47:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 755CD68BAA8 for ; Sat, 26 Nov 2022 16:47:14 +0200 (EET) Received: by mail-ed1-f45.google.com with SMTP id z63so9903359ede.1 for ; Sat, 26 Nov 2022 06:47:14 -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=GMt7XSIduwtghIOM2O5zxV9OVKvic4KLdF7gt4tWzJY=; b=HG+UlO/L1E3bsVcNgoejsHZ2IeKb51sn9oCtiiLmQZEvfZ5naQ+g+NZXdFoGDzcvy8 YF0iXIW+s3get5sGY2BP94sMWbYTXqyRnKoyzlKX/zuWIFkZYh1N9Vpf9B+EzZpaYtTR Kq1/LYJvIkKEoGgEM+eNxoZGWTLRE+B5PFGas8iRirNdjDcHHBv6Ue3GbNSMcI10aSPe nvD5NsLRdn36KwmrITwASkfSM4Z2nZKwHJShZzbNTkiYsA788IuphwA4m1KIxYCaaVkt BeNXpSvfGyJCi+WNREP5J1/8bztdaENFJrgaqW0959P1VxCHmuua/PPGL7p0/93QI3wL 0+zQ== 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=GMt7XSIduwtghIOM2O5zxV9OVKvic4KLdF7gt4tWzJY=; b=YeWN8fsKNZ+Hn58rRNcn6OgvMNvIDe33ZxVTL9wT7Qm7iZYfQbr9CxAl3FtrVvi3Mi CG9YWUwNCuJjAYT67d8mQd0ZeS2wjZtpPeQQOdOhY7AEIeFkEkQ+AOyZDYNWSa+OP/lb A4AzhVfiE8/Z/QP5GMVEcSNDv9aA9Ixb4U/7jwneMOjEH1OrpddwHl0NdHVe/rBdKL2A zDU6m0iWo7HLp+uQdg9AR0Jokl3v4Swm7lmTdREQREIT8zVElXBu7FpbhEFPe9J6GOf4 xEtzKyiEXdCIOnC28rD0M3pOI1Py0X/oc8jd/w0VQfcsTHvfiAwunRcTUMTk5Dh5tSpL H5WA== X-Gm-Message-State: ANoB5pmblW47KhU4Q/N5pIPJo2ZneHrocQU9ygYkamMBri5h/9kEW2Pk Y1S5ccc3tleKell65ZByIRJ8DvJScG4= X-Received: by 2002:a05:6402:3886:b0:463:ab08:2bc6 with SMTP id fd6-20020a056402388600b00463ab082bc6mr23364869edb.143.1669474034199; Sat, 26 Nov 2022 06:47:14 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:13 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:40 +0100 Message-Id: <20221126144648.73162-24-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 23/31] avformat/wtvenc: 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: Dse7JLcFR7TX --- libavformat/wtvenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c index 7e28b2082e..62dca62b06 100644 --- a/libavformat/wtvenc.c +++ b/libavformat/wtvenc.c @@ -670,12 +670,12 @@ static void write_table_entries_attrib(AVFormatContext *s) { WtvContext *wctx = s->priv_data; AVIOContext *pb = s->pb; - AVDictionaryEntry *tag = 0; + const AVDictionaryEntry *tag = NULL; ff_standardize_creation_time(s); //FIXME: translate special tags (e.g. WM/Bitrate) to binary representation ff_metadata_conv(&s->metadata, ff_asf_metadata_conv, NULL); - while ((tag = av_dict_get(s->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) + while ((tag = av_dict_iterate(s->metadata, tag))) write_tag(pb, tag->key, tag->value); if (wctx->thumbnail.size) { @@ -698,11 +698,11 @@ static void write_table_redirector_legacy_attrib(AVFormatContext *s) { WtvContext *wctx = s->priv_data; AVIOContext *pb = s->pb; - AVDictionaryEntry *tag = 0; + const AVDictionaryEntry *tag = NULL; int64_t pos = 0; //FIXME: translate special tags to binary representation - while ((tag = av_dict_get(s->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) { + while ((tag = av_dict_iterate(s->metadata, tag))) { avio_wl64(pb, pos); pos += metadata_header_size(tag->key) + strlen(tag->value)*2 + 2; } From patchwork Sat Nov 26 14:46: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: 39479 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6219039pzb; Sat, 26 Nov 2022 06:50:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf71ZSXdOfW5OwNdRK8RAE2nt8qzg+ejx6WoSww9SIbr2NGCcL1Ie3z5s1AekVdhHQ/AxYB9 X-Received: by 2002:a17:906:2352:b0:7ad:a030:487e with SMTP id m18-20020a170906235200b007ada030487emr37545481eja.508.1669474226330; Sat, 26 Nov 2022 06:50:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474226; cv=none; d=google.com; s=arc-20160816; b=FaJDfuOwbbTrMTJDRzlijVhqOSXhVAtM6qsMs0JpbRvphEDaJ6/d84dyNrqyu5euPh 5efRxMfDU/cypPxvA/+NNe7iYK1EqQfJ8EV20PSAC6Uvp+aDKV2uSlWWhkn7s1vj5v0K 1K4YKAmYBRbHUcuw4i1ANX0Ev749APyLVOKPeYeQbU/mSXKMOwm2TViyBrEJpxD+d8/7 bF9H8PDyspi/seUMnfTcoao5nbPuqQSbT3EZmZshZbK1EiU1LFNaGYgl5wjCj3u9E2uN X/km26rWZ3K24CoZdjsbJwBG4Hzc4RQ1YUd4YTv5z+HmEInVXJo4SVbUACIl1ci19R5q 43bA== 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=zrbHYySRU32lRLUaBU5/LsbUZ32gtUFXO5b1D0KgoBg=; b=x/Nd/nCIDawmRKyXpRWyBIBMRc0bjGa7kK7sS1DjjvyAB6/b9d9t1Am+FGEJ3St3o2 QkviYLG1fJrN/2X2CKYfXVK1txIGCBfBuSyMAv/7kBSBcoFOcOJjc2l01YjAqlc10TLn WMTer1aQ/8fV5h0/94VEdWqGZiL8bsIbGzt7pJOIw5vj8BeH8ApFe4kDaDedNy4tkz0h h2KPfaZ110aWZjL2R87kqei8KYjCguAlaz80KdF4EcGd8eOJkPo+U302st803riqY1So F0huIXREJ1DpjU0u5yeMCgWSHHHAOUG0OfK7+8oPmluIoIQYaHNoM2HznB8bnEZnYKth 5sTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=PDwllYUI; 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 cn15-20020a0564020caf00b00461d726439asi5704128edb.538.2022.11.26.06.50.25; Sat, 26 Nov 2022 06:50:26 -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=PDwllYUI; 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 DD60768BC8F; Sat, 26 Nov 2022 16:47:28 +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 34EC868BBE2 for ; Sat, 26 Nov 2022 16:47:15 +0200 (EET) Received: by mail-ej1-f50.google.com with SMTP id i10so16072378ejg.6 for ; Sat, 26 Nov 2022 06:47:15 -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=zWaR2XLWV2LYN4aLS4o9Z0WXnBSoWGGlLmoDs8EWEzA=; b=PDwllYUIbU/cGu8cabTAZd2g7+6B9Ot3husTzjhxOw/5CPNs53ytCpTRM81j64QRF1 sLEJ2Z/AhLS8XleKFhe0Qag4HSyUb0US3nxwx6vbPhQqyzwYBNzhqRa0GStMvo/W95Qs iBlPsTUlONbqOBqH6zcjqbNcYL+ag7h0VA2tj4/B0Jcm591N0DHPhJwvZExhoW2l+MK+ IKbB/8RZaDCDkjG7seS/j3arOuh51lRXoEYvgcqWVmJ48uzvPdiR4pMgKLiZXSRve5yX wNarY0rYYXoPz8YUVuz2W5HXuooLdwwZnfWGXLd6N2oiSaEfpRf1dkL2UvrDenLZdAzg HJgA== 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=zWaR2XLWV2LYN4aLS4o9Z0WXnBSoWGGlLmoDs8EWEzA=; b=0QIDGvlc80F85FqP0H6Bwz7pMhuWLNEo3HPMv46n9xlYc4AQSRGFeEgEnwVT5K9CJO KqmS9SDKMFcjrhBf7F8iP9XmaZ2MeEEtqArKz82boInwWDNNaCNrvgjbm9dy/54mfPkf 6K1yOQyeZDwead22I3pcX9MgEJDAOQGvfF0N7disYO0zdMGh2GgtMHeCcmxq7NuGZeXT OtHxm/OP+BA2eIHJoZsI5GosdiEGZIIEPLURVeqRS0PxwfGUuG9OcblZx1lt061sL0S2 VzC276DZK7XzGB7aNx/ZTBnmOQTTGntAbkFz78F8y6hqpiM7NOuibxTDCZtlOkCkwBCq E2Dg== X-Gm-Message-State: ANoB5plaw2QEFj2weDUykVwVhtB3FNwG0rs2c+hJu2mFcON1MN706b/W RYQuEVuPWZy+NqkBK7f6j7l1K2cFFyI= X-Received: by 2002:a17:906:d8db:b0:7ba:8633:7f7b with SMTP id re27-20020a170906d8db00b007ba86337f7bmr13834809ejb.206.1669474034920; Sat, 26 Nov 2022 06:47:14 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:14 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:41 +0100 Message-Id: <20221126144648.73162-25-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 24/31] avformat/ffmetaenc: 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: OwtyQ6+wRIfq --- libavformat/ffmetaenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/ffmetaenc.c b/libavformat/ffmetaenc.c index edd66e1a04..f27ac1ac50 100644 --- a/libavformat/ffmetaenc.c +++ b/libavformat/ffmetaenc.c @@ -40,8 +40,8 @@ static void write_escape_str(AVIOContext *s, const uint8_t *str) static void write_tags(AVIOContext *s, AVDictionary *m) { - AVDictionaryEntry *t = NULL; - while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX))) { + const AVDictionaryEntry *t = NULL; + while ((t = av_dict_iterate(m, t))) { write_escape_str(s, t->key); avio_w8(s, '='); write_escape_str(s, t->value); From patchwork Sat Nov 26 14:46:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39480 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6219101pzb; Sat, 26 Nov 2022 06:50:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf5xK9XhQOy73hBpQUH/4IH7VaZ1z7XDzz7q7Hl+s+d282AZaM8zVaKa/tZsTiPs5vzDYxtr X-Received: by 2002:a17:906:ad97:b0:7bc:42f6:153d with SMTP id la23-20020a170906ad9700b007bc42f6153dmr8249082ejb.204.1669474234567; Sat, 26 Nov 2022 06:50:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474234; cv=none; d=google.com; s=arc-20160816; b=PbYAVrrIPmpq631s+Rm8jBymQeqUTmLD1hLpiwLfvxuZAo8cuK7r4CBB/IByzrUALo Cg4Po/Eb/qRSRm/zZLxpNTCH1LAV3zh0IOzisZwi8ZMtHLtVioZ4rMxvEPaRoHhOfbW0 IINkt1D/DMkZrQcWkdG9MkI/KT/8h5vr1zYBBOl2Rf0738Der/A8trYOLk+q8v8oRIAI xfgz0/1fFYPm1DWYFjI7l0q3UnlaCrCSQgDAfixkAg0DysWwNnJf59lu38Nu0CC7TJso j5+axHCWns5kOM8MShOTgCoBa5oHgM0HxUS81UnVi9IM/v87HANuorVPRJc7ebA+Oh99 hGdA== 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=8P/eu7JJz3HY7AWQSLGFcTGy2VmsE5eMUA5VTXpKq5k=; b=Gk2fbqRnocaDFnoASwngeFDtffZJQQN5S5XvOn1LDytw0b7qd9N0LJDh6yj4bYnOk6 x4yIlT0uXONDFxmEQ7gj7p0MRd4VD+dZvZQ28roJ+LK4rho3wYmksidbCzIjsmcDtibR goVMLff8H66NkGyZyIbh29I0/oIEJTjcxCi/onR8ZA/0Pgv53WdItMGFc5VtB3BsSsGu Cgw13mcexo+oZ4qHCHXGilumd+uWG9revt+AO40+2ZAGneRXplcecX8Vfs97MJwTE5oS mXSUXHzUpZMAAw4GQfHo5hmSAUFP81s4gvCQ/I4uF5CIJCRUpH0eE//1iYOjpUdXMbK1 zQfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=OX3ILk51; 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 h8-20020a05640250c800b0046abb9e43a8si4945565edb.321.2022.11.26.06.50.34; Sat, 26 Nov 2022 06:50:34 -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=OX3ILk51; 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 DD1E568BC0E; Sat, 26 Nov 2022 16:47:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCB1268BB5D for ; Sat, 26 Nov 2022 16:47:15 +0200 (EET) Received: by mail-ed1-f52.google.com with SMTP id x102so9954889ede.0 for ; Sat, 26 Nov 2022 06:47:15 -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=usF8IYSm4A8E4G8ZBIFm+bYtC1XpOWWOV+xjiBQExXg=; b=OX3ILk517ZDSgFeEQxCurtopB0JGhy3VC6Ulv5W672WxGJ+O4KUAfeR1zdZR0H988o csiqnzjxcBtpkHIrqFlqSW+NLmzm7RKh783ooIcKUJ2lUljFYk8gh2g4dZOlJRSSshZo DpOjbZkkH6jAudqhdZ7HG0uaIhbOszgGCawt81dgMIdLqvGHXmHX01kr1z2DE3q4HXbj dT3wm75d1KYdQUjqB2nqVXuKocDhGepMxDMzGGIEy0nWBllKXfkZfA5E8mrXehjdlRxS YjrJyqD41QSDnr8iaF7gQ6/yuNMLKMlupL5Y4+JYM5clyRYXV6Rw4bUdhgujpPoHDxtp n9jQ== 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=usF8IYSm4A8E4G8ZBIFm+bYtC1XpOWWOV+xjiBQExXg=; b=VZATu9ex6I6M8YupvYJxlKGaMT6/2vLH1ggLbiMa0cdBTkdbX3+dI8zwW1vwA3ZI0+ 2m5JqIjvnM7ahVhK4w+3bQ4xU0nBDhSfvFoz8GXh3hQ0eOY9WWk9rbRMBCEEmbXnEPuY oXiHtf4uFyL+RIf7aPnxoz42bAHkPUpfXp28+EHu45VwxoR3YrE3y+nKrINIQZQ2ItLv JQN85vf7z5k/4kSc6Q7SF/0MRAP9ZrHCZrrrpf48wfDvGYWDjU0UjUD+dUEBw8TcAZqd 8kFX1FTrn6cTO1BcQO1CQnptuAB9s0MREWjQhPc01n1SasRchOeN+BoGrfxy9r7v9Wc9 tRaw== X-Gm-Message-State: ANoB5pmMBF71Z4C7fzRQct8mxwxpuWEQpP2OBqBq+pOidnsInzOswDgD E3SWH7yFvHDx4dTMMpyHHvtlvoNB5m0= X-Received: by 2002:aa7:c788:0:b0:458:b9f9:9fba with SMTP id n8-20020aa7c788000000b00458b9f99fbamr24007193eds.305.1669474035606; Sat, 26 Nov 2022 06:47:15 -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:15 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:42 +0100 Message-Id: <20221126144648.73162-26-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 25/31] avformat/id3v2enc: 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: Bww092AN6+C/ --- libavformat/id3v2enc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/id3v2enc.c b/libavformat/id3v2enc.c index 515d2efd7d..ac907c2758 100644 --- a/libavformat/id3v2enc.c +++ b/libavformat/id3v2enc.c @@ -150,7 +150,7 @@ static int id3v2_put_priv(ID3v2EncContext *id3, AVIOContext *avioc, const char * return len + ID3v2_HEADER_SIZE; } -static int id3v2_check_write_tag(ID3v2EncContext *id3, AVIOContext *pb, AVDictionaryEntry *t, +static int id3v2_check_write_tag(ID3v2EncContext *id3, AVIOContext *pb, const AVDictionaryEntry *t, const char table[][4], enum ID3v2Encoding enc) { uint32_t tag; @@ -167,13 +167,13 @@ static int id3v2_check_write_tag(ID3v2EncContext *id3, AVIOContext *pb, AVDictio static void id3v2_3_metadata_split_date(AVDictionary **pm) { - AVDictionaryEntry *mtag = NULL; + const AVDictionaryEntry *mtag = NULL; AVDictionary *dst = NULL; const char *key, *value; char year[5] = {0}, day_month[5] = {0}; int i; - while ((mtag = av_dict_get(*pm, "", mtag, AV_DICT_IGNORE_SUFFIX))) { + while ((mtag = av_dict_iterate(*pm, mtag))) { key = mtag->key; if (!av_strcasecmp(key, "date")) { /* split date tag using "YYYY-MM-DD" format into year and month/day segments */ @@ -220,7 +220,7 @@ void ff_id3v2_start(ID3v2EncContext *id3, AVIOContext *pb, int id3v2_version, static int write_metadata(AVIOContext *pb, AVDictionary **metadata, ID3v2EncContext *id3, int enc) { - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; int ret; ff_metadata_conv(metadata, ff_id3v2_34_metadata_conv, NULL); @@ -229,7 +229,7 @@ static int write_metadata(AVIOContext *pb, AVDictionary **metadata, else if (id3->version == 4) ff_metadata_conv(metadata, ff_id3v2_4_metadata_conv, NULL); - while ((t = av_dict_get(*metadata, "", t, AV_DICT_IGNORE_SUFFIX))) { + while ((t = av_dict_iterate(*metadata, t))) { if ((ret = id3v2_check_write_tag(id3, pb, t, ff_id3v2_tags, enc)) > 0) { id3->len += ret; continue; 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); From patchwork Sat Nov 26 14:46:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39482 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6219241pzb; Sat, 26 Nov 2022 06:50:51 -0800 (PST) X-Google-Smtp-Source: AA0mqf7aZqeyPVzbCwd1NCkSl6VckHvIOFXuD4r1j7G+yu1b/gtylkIJ80HPLPN/Hbc4gAhtGGSh X-Received: by 2002:a05:6402:3719:b0:461:4f34:d8f4 with SMTP id ek25-20020a056402371900b004614f34d8f4mr41405055edb.144.1669474250743; Sat, 26 Nov 2022 06:50:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474250; cv=none; d=google.com; s=arc-20160816; b=lj4SYpvxTzKye6xxMJdA2MAGju6zA6dihRy+3v6OmPgXjEbIC1odanMdw0EhHOyOqM kqYErUyQAs4yJ89aSqQVJhd2aw3NSzRsulsfTsv4nWgYYmUGCGJfej9m6/Fh/A7YM6us LSdaR6FbGQDUbH4ICfAX2jrtot/MUZ6Ro76M7KXYb0ION8+RyOY/gp5/EgY1By15m/aA Kjf+5zuu/YBigxXfaRE05GHydDAkODkVxtcmQ1Wxiq7UwOXC9EcQaKgN5E+ZreDy12jy 7Y9tipUv+NlEtc+uoXB6OYyVgQ1vDajmG0POC2tU9ZAT+TSUgOft+1x411PLpK8rDSTn uYng== 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=djsn1MPA9pybNd2lORfcGZyitq/nU5rgpYNYKs6AP0Q=; b=SklcU85GH3HearKdOCi/6A/mSxv5rHjZhcjai/Y2vDxcksJOdQqufGb16Cz/2STPtM 5v90Uu9e0KKViHuG17+83sjYVYk75SEItij0zEzrOB8im2uQakXjJ9KgSAAOvbA4saYk BfCJjO/xDpOFmalBZlYR1mN7J6hD/IJ/qN7S4JYcAvBAiwWHktPfsHi8LCvsVKKPaQO5 pLdndmDqeJWTvR1vRlxyrLBeVGvkbzCOhRzNd+2ka0f9wkDwJWJ6uf8Nfl8iwdrdRZN4 vjGXs4nH6clWLTRwlDiyRz6kXdYzxzQqIzyu8B9i2VwCATKLMBy4lVzWB2rd3k7WKcQi gKbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=BLoKnA64; 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 eg48-20020a05640228b000b0046a353c3b73si5448771edb.280.2022.11.26.06.50.50; Sat, 26 Nov 2022 06:50:50 -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=BLoKnA64; 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 D958E68BCC2; Sat, 26 Nov 2022 16:47:31 +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 986CF68BBEE for ; Sat, 26 Nov 2022 16:47:17 +0200 (EET) Received: by mail-ej1-f50.google.com with SMTP id n21so16050716ejb.9 for ; Sat, 26 Nov 2022 06:47:17 -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=hrpBBK3SBN847LZAuL/qymlOSj2nIAa7BzWJxGkJMNc=; b=BLoKnA64VFLWnP4ekkRfo/eZJZ97l2TEWr19BSAVqJVxE4U4pZqmzZ02fjvWZU1xoF CHdk4LtGMK8CPSeExlLrKMsGd5W95IjPvaCB4Gz3WV64ccZZlxizdQKu9Rqja7dOGV+L O7xDyPOlCxbQJvt6lrrPu6I948NwLDYbZnUmw95vU4WI8Ku0JtEgKhwjVvHMuqLooFty 5o2+FkWJNCwntrxkdk7g2Wp8MY6U6wc+vs51VcuppGXKGdEmjp9krxfjZCP7d+1vkrzu w9Qee5UoYaOSV+wzr7AV4G4EzvXLObxbhnsnHZVp+/fkXJK6zRWxM/23wZnFXZn2mRgH i1/A== 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=hrpBBK3SBN847LZAuL/qymlOSj2nIAa7BzWJxGkJMNc=; b=2T/LgRnvOQqxMPJ0NL+FlnsMa+DssmZ38SfFtfOTK9LN4dKiwkWE5D5mmJZnigmAq3 Jo7Tx+YdEbdJzHzabEK1g4gMPxy6dZsQklfCI1Nw8wiF7g6mJidesE/83dZGBFfuMUlJ T/tRdPG8sxKucb/j6LlSPlD/u+/ory8l6bJUflzWVeE1/e7XQfOKhqPaxz2bgmR8Gz0U Bze1DwJZzRYYTlfAqdDrG0Da8M73tX0pa1VqXzBsNJluAYKjASg8q6p9a8C5PijzNQ8W TTzyBrxHyFcLv8mmunIjM6dUggLdnbULEhvPnLSloGbq9IWuOxL2BrZHz4k26Zg1s397 uepg== X-Gm-Message-State: ANoB5pm3dqeo+M63i+hhYC4om3dAf87P1cTrYUjQYpb/bsk3x+Hh/p3c Ikx/9nUzh6W8Z6TiAHnRrWQ0GPeMzWk= X-Received: by 2002:a17:906:fa19:b0:78d:9002:fe3b with SMTP id lo25-20020a170906fa1900b0078d9002fe3bmr32987073ejb.769.1669474037019; Sat, 26 Nov 2022 06:47:17 -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.16 (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:44 +0100 Message-Id: <20221126144648.73162-28-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 27/31] avformat/apetag: 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: d7j8jxuKhcZz --- libavformat/apetag.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/apetag.c b/libavformat/apetag.c index e861aac0f8..f2794c46f2 100644 --- a/libavformat/apetag.c +++ b/libavformat/apetag.c @@ -175,7 +175,7 @@ static int string_is_ascii(const uint8_t *str) int ff_ape_write_tag(AVFormatContext *s) { - AVDictionaryEntry *e = NULL; + const AVDictionaryEntry *e = NULL; int size, ret, count = 0; AVIOContext *dyn_bc; uint8_t *dyn_buf; @@ -184,7 +184,7 @@ int ff_ape_write_tag(AVFormatContext *s) return ret; ff_standardize_creation_time(s); - while ((e = av_dict_get(s->metadata, "", e, AV_DICT_IGNORE_SUFFIX))) { + while ((e = av_dict_iterate(s->metadata, e))) { int val_len; if (!string_is_ascii(e->key)) { From patchwork Sat Nov 26 14:46:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39483 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6219315pzb; Sat, 26 Nov 2022 06:50:58 -0800 (PST) X-Google-Smtp-Source: AA0mqf71G2hGx7dqRGrpMnHtK/B0APKZvTw+tqQWqL473CHMhsswAxEHsX77rIdRBEECvGuMuzzr X-Received: by 2002:a17:906:8d86:b0:78d:4742:bb62 with SMTP id ry6-20020a1709068d8600b0078d4742bb62mr25389471ejc.43.1669474258590; Sat, 26 Nov 2022 06:50:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474258; cv=none; d=google.com; s=arc-20160816; b=dfDNuNgMLkgfE6yEwt9iHQbVkN5ehscoR+YA4YHU5yV7bLy2/9gcbi9etiXINVY/dB FzEQUnOYhlgC7udUGZSy2SOKfprgZ4A2tCbbSUai3kbYNG1ufhK3w0xGYD8Ta36t3AFs hz1S4Z/Ee8ejjNxJpDCC+Oxvj2JCh2KHcYLM7tZ39VREKdw0sOqhmqEY3xvku/0o9pMZ e7kwTvST7hX7LgudORk336U2XRUc4cR3oEfVG7WKjFs2UW5IS+rn2y4IqjVHZTIOJl0+ Iu836zmfUhehJu/iNC7BMHdV4BQPAmdOQdlaLj9TIzoIkdDl2QDtGtDVAlRL51uvOPGn kFiw== 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=N0RyILuM/pUTnSzs898nJg6emaPgP9EvI1jJ8Gis8q8=; b=nb1RLD77PPdGhQy4c9oIlJdIhwTo+GxxdRgg8edbJo7AAbttaMXbMKZhid+rJt2saw lYPDrLZlrhzljnW914kH7aL80ctg9ZJ0Er1YqI6GgU7s4rAQu75CbeLNPaZ1lp2Kry58 un73q3vIEDnAEgKbaKbj6cri6yl1nTt4y9oCRncuXsldzbSCOb4lqROWM5/O+4gyLJ3o tcvMCH70nIhF/EQlOsowJvO5mEl4k2a/gBTcVbH9yFnJesZd/UE/0mJ6+RP4WkUGbSDH 4s8iCHwL/mBXk/POpuGUkF9bZQz9MZBvW/fiylAxXS0PoYqc+LvUBmd1Pb/fqPEehUSE OLBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="bh/ufj6C"; 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 hg3-20020a1709072cc300b0078fcfc5d24esi4954327ejc.618.2022.11.26.06.50.58; Sat, 26 Nov 2022 06:50:58 -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="bh/ufj6C"; 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 BF98968BC19; Sat, 26 Nov 2022 16:47:32 +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 5BB7968BC0D for ; Sat, 26 Nov 2022 16:47:18 +0200 (EET) Received: by mail-ej1-f50.google.com with SMTP id ud5so16098596ejc.4 for ; Sat, 26 Nov 2022 06:47:18 -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=VgLhnwDfUVeuMSRzpv/uSUy8TLeSA086jU8CqbYxcpk=; b=bh/ufj6CzxECXdS0KyAUs/DCFFRNR/g/Pxx2Ry/Y1zb2kxjcY35WYpE5QPvG4FeqBv UIzpAInb0A736k63l2NBYRtszK3/HvvewzgK+Y+vv7280n5XZlvdiXiMId25g58dDBqK egA+42x3+WAiUj7jE1SP+FJjtBJ5cgoi2rTXnL9n0y0woWcjdfGKwqlI/KrTI8Zavnx2 3kUUwICicWa8fTuyNH3hDswFGgZ3nbliWuXXdUiEfB2bAPAjiNPmqL/N0FGFVqvRIddc AgE8rdv+YBbMCyT8A8il22RG5+QrvYzCFY8dVviBxPIY5EkmcdUCC5dyRVIhyHf7bWqy uLxQ== 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=VgLhnwDfUVeuMSRzpv/uSUy8TLeSA086jU8CqbYxcpk=; b=apn6tsbLtGlOVxzD5gXzVBRxqAbaJHizyawDnhcGQiJTsDNuXX2sqljCzS8Hn7Wvnv h0YJGw8sa8IrDpoRYkmNT0Xd9UgbjpGpKLSxMauOOzq3OL8/zPuIkf7toDgCMjF2OhXz 6ikIFcg4pBZWrKZvo9GW60SOoqZ5/UkdeF+VcqvkfnvqaNiqEZdwkNmeK5aEaE/shsY/ L0A2wLrp8EP176KazouBE2zEjDriDaAaMom6r7ZnC8WuiuFyvjcb3XZyk48ZbuakOlh2 lBWUsLMYyWRFX5M5Lv7+RC3cd9YTD9310KOS9WHbwf2QjSIg/J9eJQfHisFh1+lUtcpR 3HGg== X-Gm-Message-State: ANoB5pnfwUVZ5Rr6W1BtH8LJaY1Wxwie3fdJzVXTGO7S5slx8ioizX0O IqsEmFt1RV/dg0QXsRODxK6s/PXzmcQ= X-Received: by 2002:a17:907:7650:b0:781:e568:294f with SMTP id kj16-20020a170907765000b00781e568294fmr22677143ejc.447.1669474037753; Sat, 26 Nov 2022 06:47:17 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:17 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:45 +0100 Message-Id: <20221126144648.73162-29-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 28/31] avformat/asfenc: 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: NinOaRuiONRQ --- libavformat/asfenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 70800a6df5..47240fc0a8 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -570,10 +570,10 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, end_header(pb, hpos); } if (metadata_count) { - AVDictionaryEntry *tag = NULL; + const AVDictionaryEntry *tag = NULL; hpos = put_header(pb, &ff_asf_extended_content_header); avio_wl16(pb, metadata_count); - while ((tag = av_dict_get(s->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) { + while ((tag = av_dict_iterate(s->metadata, tag))) { put_str16(pb, dyn_buf, tag->key); avio_wl16(pb, 0); put_str16(pb, dyn_buf, tag->value); From patchwork Sat Nov 26 14:46:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39484 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6219403pzb; Sat, 26 Nov 2022 06:51:07 -0800 (PST) X-Google-Smtp-Source: AA0mqf6CNzaeIH5gPsc4CsDFv3ZaMqYk+eDGX8DolSDAIagyKe0LJ0Qu7x9QrsUILNN3jGPIdduW X-Received: by 2002:a17:906:6892:b0:78d:ab48:bc84 with SMTP id n18-20020a170906689200b0078dab48bc84mr38631651ejr.22.1669474266872; Sat, 26 Nov 2022 06:51:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474266; cv=none; d=google.com; s=arc-20160816; b=f+7fKL5SO4+Xj7OXSNSyxIZBe5D1wXWjXmkUbbMkhMSnN2kki3PnVKN87uU7Uoehwq 9+64KWY8myUzTORAV7HkYea11H1cTqF5tYUqvsajKen3bGufWDmmjPwdsfmEJ6tueKpX oAb+/u5TjWTk8AXHwjMJqW2YF5BQs2i89KqbBUEKQ+IWqIBU9rdfYa0eYy9dKNvsg24O IMakEPxNIGyBtMJsQaIXxy5XVYk2bKBuSQV6QmMhO/HIKjiN96iS7c/rvmtvfxMMuhRM 17CImzsDPaUyb8mVoEmT49flVO3ng+Ag6mzEfnIHJKDqX/aBbgKnJs3Oe11EI1wu4PaL WC9Q== 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=fQjJp3ALL7HOHs7uVksFKOXvCfpgjS9QdYpXTQM9cOs=; b=e9mBdCRHL3aYsLr8DkruM10zBvBejbG0ATCcmRz9Mcvh9MQJK82idBcqv2g81kJhOL FY+/uuBjwB+VWZzfs+HGm8/Bo3dSVf2trTe9p0QSxNIvbF1f/6IdW0+XpSdySyk9U1Pw rs+Iy1MB4Mn8C4ciQXRDbx2YhANZxVEkeY4JFWnfmO0jcoj2rjvcZd9Rjg5m0j+YFmSp uUgABAe+gUplLwYwDnLMqfuwmJNVuzHi94vYMzHLo5f331b+m/gOV7QX+8V1kn5wBI/q beamf3r6vFDAatbGz8wgoJnDDIZJQAzBe3R420jWyG0G2EoVCp1DsBDR/26gGrLowh4n qW0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=HG4gyINH; 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 dr17-20020a170907721100b0078decbc3f73si6330744ejc.460.2022.11.26.06.51.06; Sat, 26 Nov 2022 06:51:06 -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=HG4gyINH; 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 B029168BCE0; Sat, 26 Nov 2022 16:47:33 +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 9F31A68BAEC for ; Sat, 26 Nov 2022 16:47:18 +0200 (EET) Received: by mail-ej1-f50.google.com with SMTP id i10so16072579ejg.6 for ; Sat, 26 Nov 2022 06:47:18 -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=W7yoqjrBB+ge8dqCjWZzJBbZ8Tp+v6XEVEhqmUELwho=; b=HG4gyINHs/NtytEjOQKWfmvhQoVCzKLc4ErrH681+gn7TYgo0GN9FQwQh1tHZNTbQM 6GBFGM1CSzGTR6gcykytQZRz64gHMNWuXHpeDa1tupfRdNDc9B2jn6Sn6xkcAHdJ45bp azLunIB9B4ldQLjPz7/Olf6UnI0GGLrnhcgZnCh/tQ0eXNXplrbeZPj2oTKijmjPC1WK YZbUQUTWzqG1Lefwwcus8UrYecuuRBC921psPk/0+sd2zCYSHZyAtrYEbbuJlyV492Oq utDjs1upZCnsZdScZG53m2t/XFGUVA2/sfigFeeyjtajyGoo+b61CjNzn0VYcbEpxJNe yZXw== 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=W7yoqjrBB+ge8dqCjWZzJBbZ8Tp+v6XEVEhqmUELwho=; b=StGqw91kfLjOnCe1o4sQhYQI9pipJu1plEVRYyQQ/ElnURvFPQ1eAKBhcPp2LLVOWc 7/i1DE9w5oBTIbqhveLVWRVuNqgRwocqObiGCrZXBiAx9ULGZytxP5zKB+kd18JabXCW l96yCbd1NVWmMDIMjJrlI5RF4/TBLRJc+3zzubrt1EoJGwEKHyWUfZTPRsJeS7pOj9Pz MSwGDKv0c5Itm/ufjmORjIHOlsgFS4NeN7ajPPRU+dM+BlYRwZFYe/zxgWuufpiBZ93C p0jFsm841XV1bndnOrZX4LLuJC6bVessJe3SwcPEhYQYbBwwo09QLHIEH2+Pqi5CVZJR 6NGQ== X-Gm-Message-State: ANoB5pmvzT1DbHT6Or/5G2+W4uhxYQ0FRLtfUhKSB7+tIhs6u/gzrNfp rVgtbML8odzf8MNQVEc65mqYApQKHHU= X-Received: by 2002:a17:906:a397:b0:7ae:5381:bd02 with SMTP id k23-20020a170906a39700b007ae5381bd02mr35541126ejz.286.1669474038421; Sat, 26 Nov 2022 06:47:18 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:18 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:46 +0100 Message-Id: <20221126144648.73162-30-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 29/31] avformat/http: 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: FTccUFI2uzmE --- libavformat/http.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index c5c48c7900..7bce821535 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1021,11 +1021,11 @@ static int parse_cookie(HTTPContext *s, const char *p, AVDictionary **cookies) static int cookie_string(AVDictionary *dict, char **cookies) { - AVDictionaryEntry *e = NULL; + const AVDictionaryEntry *e = NULL; int len = 1; // determine how much memory is needed for the cookies string - while (e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX)) + while ((e = av_dict_iterate(dict, e))) len += strlen(e->key) + strlen(e->value) + 1; // reallocate the cookies @@ -1036,7 +1036,7 @@ static int cookie_string(AVDictionary *dict, char **cookies) *cookies[0] = '\0'; // write out the cookies - while (e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX)) + while ((e = av_dict_iterate(dict, e))) av_strlcatf(*cookies, len, "%s%s\n", e->key, e->value); return 0; From patchwork Sat Nov 26 14:46:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39485 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6219485pzb; Sat, 26 Nov 2022 06:51:15 -0800 (PST) X-Google-Smtp-Source: AA0mqf7eAAu/eOgK3/opHKtQJY7tsUK+7gWm1lpy3/NUilwllKAZ6iJDVbLcqXqdqyi3tgtCuBGd X-Received: by 2002:aa7:cb07:0:b0:463:ca19:6cdf with SMTP id s7-20020aa7cb07000000b00463ca196cdfmr41204849edt.379.1669474274919; Sat, 26 Nov 2022 06:51:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474274; cv=none; d=google.com; s=arc-20160816; b=hg3GOreuwjdO9R/FOQybkFAnZ+yOE/0/toTBN5UVRgBDfcrmJtNsyfNa7Rt22z06+Y D2pG3FXgZBLf6PjXmi4PGLJL7PwFpD5Ep3sev8xbepB6ghLOPNVtbFKFvBFWbX/23p8a maNHMuPyVByHm/Zz/5O9CSGFt38NhcSYI4Z7c38HtkaGMIs1cQeYven6QY1jaMPBTCRX aydJ//uGW7WhYEo5DkQmK5FGeOgbarhSujuaQ8CwlNlQNnP1vNtIojxl6pNr0P3zjWps lAgNj4yzcRuYjkk85i4Ye+h3fW1XfEh59MUNcqhA3F545Pl9YqIPJtytS1Zg3fuXyvOn u3zw== 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=YP6Z9+kgTkHoREVL2E0oa3UzSMcZhZodW7q/qoaD74E=; b=gQ27lt2Ke8raGRk7f6fMqWc5pY4LtF3arDWbkkDKpFpZ3iuTJQHvB9T4gnLao1rOBA M0xmZM6uEusombtrRORcaU7XZX4jOyqvqcQhky91lTMtqkul6xZxL7H8AjdZlaHQFOD7 OIDxecX9ryZj85qpeEXzeBYaQXYZEnaU6GwLgVmEi9QDepEwdiVD4pcOwtL+1EK92vFV yi53o0mO+hZozfZPtFDpRzgs7iXkTE7Vq6XWX3k6O1nPpWBi0PogOgNm/q3BIJ0kL60V QuynNWOZu9ig5dXo1yPTsL0jsQLZ6fjGNSSppz+KKKJybgGnbBcwSqybQX0Sg81fYOwh 87Vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=oULdetrG; 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 g17-20020a1709065d1100b0078209ff9896si6323257ejt.509.2022.11.26.06.51.14; Sat, 26 Nov 2022 06:51:14 -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=oULdetrG; 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 C8EA368BC12; Sat, 26 Nov 2022 16:47:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8694268BC05 for ; Sat, 26 Nov 2022 16:47:19 +0200 (EET) Received: by mail-ej1-f52.google.com with SMTP id n20so16180899ejh.0 for ; Sat, 26 Nov 2022 06:47:19 -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=Z1vg7usU/5kUa2r+s6BuRejVtcTGnPRnxtQJYdaXREY=; b=oULdetrG8NAGZA2Pp9ybd0YO4VprwnWQlYMAouz2Kfh7JKfdzVqi7hkK5PmsFN/Wul D4CuyuSbhWFFRenxCOQAccr4ToOR6eL2wba9uiNgA+pHGSLZVvr4BvHBk9qbl7eIGoH3 xkgXFwfT/7GutX7Rnb3UznWEOYF9NBZ00UlDqwTkbh5lRfbw06m4fm64s5m+Kyq0L2zr YpVSAj2A9eckBW6XEzTsykGuKfZRZR8ew+KtO2HeIbdU2X6N2j7oIodITIlch+BQ6YWz anP7s4K4j1hm/eFl2XCnBFHp0zpgH+6skA2VBnLP9+t/QtD3hIoLgYc5GVrg7HsXoDSw hCrQ== 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=Z1vg7usU/5kUa2r+s6BuRejVtcTGnPRnxtQJYdaXREY=; b=oXyFxMsSLvVhM7rFqKty/o2IEOQwrEAr/NP4oYRexVaybyWaMNzfuBG5lLeTZxW/Ui d1uPMfehj2NGSE7nwUPywCeY23rVzSvcctfS5hn/Q7cGzya4Jg2pjSN951JE5LObF3fm n1o8IdesitflCWUHO0TLHVuKurc4c7F9TUhyMlryS/69oRr6aSA7o6nCdwCwxgIqss5C 9fsVB1qHsV8vh89gAUkw2d2cLBjBSo0vdNSFHXol8yPNtmLSmE1dVCXwZrpJQnA0trPz sXEshlCHXf70PEejTQbB2zqjUNF7oKnCMdO5YRXa3zvG5KWLjaMxKIYi9gwBFZZo8eBV 5aXg== X-Gm-Message-State: ANoB5plIIf1+kPdEaSQtgSaNaDHMw5tD+H+GiD/4V9nTai6O0ygtwG6+ cnLYf2fMJUeV6Qg7AUC9Pr8todA4EjQ= X-Received: by 2002:a17:906:c303:b0:7ad:95d2:9df2 with SMTP id s3-20020a170906c30300b007ad95d29df2mr35744329ejz.607.1669474039102; Sat, 26 Nov 2022 06:47:19 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:18 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:47 +0100 Message-Id: <20221126144648.73162-31-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 30/31] avformat/matroskaenc: 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: DgehS+PzxdYu --- libavformat/matroskaenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 2be4f87284..2deb4284e8 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2048,7 +2048,7 @@ static int mkv_write_tag(MatroskaMuxContext *mkv, const AVDictionary *m, mkv_write_tag_targets(mkv, tmp_bc, elementid, uid); - while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX))) { + while ((t = av_dict_iterate(m, t))) { if (mkv_check_tag_name(t->key, elementid)) { ret = mkv_write_simpletag(tmp_bc, t); if (ret < 0) From patchwork Sat Nov 26 14:46:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39486 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6219588pzb; Sat, 26 Nov 2022 06:51:23 -0800 (PST) X-Google-Smtp-Source: AA0mqf7UhqRJp1Hlrs2blHxXwyFXgUU02GeWtEO+2fW5pWSbCQSMtmhYTYfjCHuwTse0rFkvOT1M X-Received: by 2002:a17:906:6d8a:b0:7ad:69eb:923b with SMTP id h10-20020a1709066d8a00b007ad69eb923bmr37981770ejt.19.1669474283181; Sat, 26 Nov 2022 06:51:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669474283; cv=none; d=google.com; s=arc-20160816; b=S19pHBIGOoaKcdK6t8mxhHOIRmekcndNNku+Wk+bxdPmmxVUj5yfMOa+twGkuTVbZm WIskLlUrUovq+nF7tahMNUNKRzX4SiCvDe8499HQqhu2tdN4gIRdKldUBQa0k8HJ1bax V8n3Jii90Y61foHuQWLQaMyR/TGJufR7pqjh4smj94MxX1eC0ZkUbRHUTh9dsQlA1LlF GMpg15c0sbU1ZJaH3aStw+bmIjiSLA+NGfMZcGWK+xDmnh2r3yqFjQHpGf7IhLItjiBH dBjSH4X1l+YymHjBLP/cBXyTZq33ycvLd6A/3J2Li/Oj8+3lJTLTK1KF4PCy2/m9qApJ zlSA== 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=owXEXVh8azBoQEQZlILumzYTYZdmXA5qXHxkX2LvYqo=; b=iaP0cXW0PjlF+IsKN8twFSNiJEM6oqc8a9H0lrtywMSatETtMj4yP5Z35zBJClypjh E41Cl3BDHI7tqXMU0SiYV/ekjstYwY+azgqnoh1rJQyngYfPcoqxZWwkNFNAprWjabHu K3dFwqaGP3uQJHSkw3dp3rTxHK/nJzI+hWeGj+MLqj4BCzEZFlFhSs1AvK1bEkHsF/9P UptQk3mK3QYrTNMeQ1nr3sY1/IAMkWlYELf8INP/slPzdiGDNKBp19IqGbIJz8R75a/i EQ2sLU89dlGADsrduhp9zI8qNl5Fl+zBpKve2ph/DOQWpxNJoPUS7QcvPy+jkzUbUyBb EqiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=cd5d1KQU; 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 hd35-20020a17090796a300b00773b8e3b6a1si6970556ejc.805.2022.11.26.06.51.22; Sat, 26 Nov 2022 06:51:23 -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=cd5d1KQU; 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 CB99D68BD00; Sat, 26 Nov 2022 16:47:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 26C0E68BBDA for ; Sat, 26 Nov 2022 16:47:20 +0200 (EET) Received: by mail-ed1-f41.google.com with SMTP id r26so7794401edc.10 for ; Sat, 26 Nov 2022 06:47:20 -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=75g6kK4y61YMFJcRLsjFZL3LzCLJ8EANR6p5SOIu8jU=; b=cd5d1KQULOw08t9JwThzLa3s+JaZAbnE98hSqeLaCVccCu+pxpX9qNgUMknN7Zqaqm x+dnaETczDIub26YdGfQdSUHZ4lvUpgMohfYweDNjCLQ4MiBG4+6UtIHDycUB1Okot4Y Vztab1DVQqjweTMTxLQDZZfVeYF4zzzD5f79fRcUB/gXyaujN7HT9DJYxHjM2+JcK/KW UW2sp2vjvyvNPHh2G6Lrj1F8SSUMmfDSyBPXdx6UelvY2Et15QQ0w/W0h3kJLpbL2jVv 01p0Slb94837PrmRpEBtR9lcG1V76EPA3Iy+4RzbSuPfwGHK0/0a4wlualKSxDI5KWIl P9Eg== 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=75g6kK4y61YMFJcRLsjFZL3LzCLJ8EANR6p5SOIu8jU=; b=IwzrJElloqTE9SaBC7VfPzB8hJxmWJ2gnY3dHalH24qWMLd5cQQTudgkZ9n7uNsIpq OZFPpCXndUTx6QEhR28r6DAwAOv7QJw+y8uF+rNEPi0Fg2oRqFg4xKFFdbF8072L6wvR XCAqPnWhLGWby7effm9GilaoF49FXAe5psx/ETftp5Mp6vikMB/GYzcI825RLNTW9pqK MIH3qDxpaPQme9R+l+pa+pOxlrlEMTPWGB9u40oEEV7ynTMXJbdo4MJM8aycHKpLI7CG HBvanEWlrg8H+4x2o1gHFTGZ2VzsD2p/PM45tkWXezAEKmh7rxxl6JQn0Dbg5dIdd3xI 7+iQ== X-Gm-Message-State: ANoB5pkyTBXs1x0J7TvyZZHRjy9oGohKfCQg8otymweOmwdznQgRsNef Y4s4BenzYJAeb82qtoP8lq2oACCJMvA= X-Received: by 2002:a50:ed90:0:b0:46a:e6e3:b3cf with SMTP id h16-20020a50ed90000000b0046ae6e3b3cfmr3617268edr.333.1669474039866; Sat, 26 Nov 2022 06:47:19 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Nov 2022 06:47:19 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Nov 2022 15:46:48 +0100 Message-Id: <20221126144648.73162-32-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 31/31] avformat/fifo: 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: jYfXEPTTGZKv --- libavformat/fifo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/fifo.c b/libavformat/fifo.c index 7b35c9bf02..c125a97b0d 100644 --- a/libavformat/fifo.c +++ b/libavformat/fifo.c @@ -148,8 +148,8 @@ static int fifo_thread_write_header(FifoThreadContext *ctx) // Check for options unrecognized by underlying muxer if (format_options) { - AVDictionaryEntry *entry = NULL; - while ((entry = av_dict_get(format_options, "", entry, AV_DICT_IGNORE_SUFFIX))) + const AVDictionaryEntry *entry = NULL; + while ((entry = av_dict_iterate(format_options, entry))) av_log(avf2, AV_LOG_ERROR, "Unknown option '%s'\n", entry->key); ret = AVERROR(EINVAL); }