From patchwork Fri Nov 25 01:30:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39408 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4948214pzb; Thu, 24 Nov 2022 17:31:14 -0800 (PST) X-Google-Smtp-Source: AA0mqf4jNY9a7EXQXIfv3LK8rxFcvdGMm5n7PwoU87POPlzYMEEtptcJMpwtaYfjjvOe1lVGZwOp X-Received: by 2002:a17:906:6dc9:b0:7bc:5700:490 with SMTP id j9-20020a1709066dc900b007bc57000490mr984539ejt.592.1669339874133; Thu, 24 Nov 2022 17:31:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339874; cv=none; d=google.com; s=arc-20160816; b=a+hsh2KHbhj7p48PH0vlqiuvuasS7J9uwjIEKp2JsCN664HSW4VXKRcSNBY5kGCkS9 Ahi7XiHugew+lhPUoo0EJglFbxaGV5Oiff9rwhbNxV3depSVMMGWI1iQVZdB5bZpyMB3 sLZZ0t789j951Z5UjwpE6YcmSBH+MYOis0c3rJZMsFWwwQAvUm2uhbQ2WBuMKC1NsTYE cnqd2MBzaQ/mhCfd59mLdeRjVlqbZJB15780IvzqE7JWh+tbBo2/FTfs6qsSMe0Yi0oZ wL/MKivN7+bX6afaEB//h+uzDxY27tmw0rPhn+WcMc/UbBQvsU1Fdn8ilUzUQ6qEYKI3 A+2w== 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=lAZq8KzM/oskfwBlJaPzEal8YxSjL8xdMerVO/xJ5EtO00474mozE0hssqHZ7WdGtR YMQBOpB1x62hrcSvFEuCGeRYRU0nVxJ3nJ6VQ44JjI7fTtYau9UHlCjcjmpkxkOmyGx/ OhDK4pUirY4aWHrO0StDHY/PcsvBZlFVLOmuQz4sZaufmrNqXw65BIqMSiKag099sJZ9 b/wMA+p2iGqpwAjS84MAw+vtS1ufKXv/PFEH9Azt5CIcHew/7a9GkBrjZ5+9qzcucFwz hYKby9A1jt2WKKAYitq5lx/CskPOUWVUmohGTx7516qU0+ZyoRiAjKKsMNsryP0AFZL3 61kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=OliMr8Ze; 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 mp34-20020a1709071b2200b0078c37681f89si2355279ejc.650.2022.11.24.17.31.13; Thu, 24 Nov 2022 17:31: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=OliMr8Ze; 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 AFA4768BACE; Fri, 25 Nov 2022 03:31:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B9C668B115 for ; Fri, 25 Nov 2022 03:30:53 +0200 (EET) Received: by mail-ed1-f46.google.com with SMTP id z63so4514570ede.1 for ; Thu, 24 Nov 2022 17:30:53 -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=OliMr8Zey4pelJCnzayZQ97jsYN3C+4NzlcTDGg7/NVLqGhNGE/2JaxtwhBqtCi7Ch Q0DNJgGd0NCk+uuRRnjlBXP56mSDGLIy1aPC26oa11GQVhmDJN7fReBevbWke8E3oGLe MuGHRF7cEErCjxcIFQDc5xqqUD3njpsCINs+opx7acC2awWHB1/h5Fgz2kvN6NmWuEQm V3w9+FhhaGuYLSGsiMDPhbkjf3iSKNq4P0bTXIg3Dhipku57MoaZW64pJTII51flSfw9 FjR3DurEM/bpkXj7rtenr85YiURnjem5GFUJFvNejReLAk703RN/u045cPujLTacaTgf CowQ== 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=dIaHriQrrxOTH1+k2kcTMbOrKTFAZZUFXUhaDURDoxm1svRR3AXOf77b4E8e1+kpe1 s9XgIHvxFCZKMvAK5oBe+lROWx0JZiafCGl5Skp/tUEQ/LHGxB7+gZyM8Or+98RuJN06 em8i7JOJZys2VKQGtpUjB6MbgYvtuO2EkCjCZ7QgfjpMmIoyizvnTiuxTFeLszexTdcJ 02oMIXlHpoumJsaS1dw5bh02EDPt8cGnzLpDfVh4/aCxn5KG/wLIWK2d0+PjViuelqJj sVd6BPN3x+lXdL70ebYkakTP23ClztXVV/p5uq4haOgFGeNjbSCtmyWoUldVJS2frvGr 9FVg== X-Gm-Message-State: ANoB5plTXU/HDhBqgTR4n2iuolOg4vLdj8Z5tdx/eKY/e8wgvzHlK63S 2UE+PIjk2WFB7TpuOwhJgFyQMaX476g= X-Received: by 2002:a05:6402:380b:b0:462:7b99:d3b2 with SMTP id es11-20020a056402380b00b004627b99d3b2mr2753677edb.248.1669339852748; Thu, 24 Nov 2022 17:30:52 -0800 (PST) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.30.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:30:52 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:16 +0100 Message-Id: <20221125013046.40904-2-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: wE+tu9aSz8ZX --- 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 Fri Nov 25 01:30:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39409 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4948314pzb; Thu, 24 Nov 2022 17:31:23 -0800 (PST) X-Google-Smtp-Source: AA0mqf5BDf3g8p4HMDbHKLjbfgGlvyXCdlm5Oll0yp0mkpR4wB92lRqlRvmRRGzDXLg0IZvwJmAh X-Received: by 2002:a05:6402:1f08:b0:461:d21a:c0f3 with SMTP id b8-20020a0564021f0800b00461d21ac0f3mr2425213edb.71.1669339883445; Thu, 24 Nov 2022 17:31:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339883; cv=none; d=google.com; s=arc-20160816; b=tzGNpAj4v6nzOK9Si0lgy0GeJqFBVPfp4Z/5B0HlzzjTIZpWuv/CMPTMoxdzoN52hs VDzKVtDXZYC2CGgqz797qvx2Ii3dlW0L+j49OXvV7ihctd2bQ0jWAqVwbdZy1MOs5RnT k2CtVJhAv4nrBPdtbBikehrw/CZ3mVKbG1tv7q+aJvKWY7O9OLp6KmzA4FvXHoTjCxTU NzKuM7NTEsscODj/RpoEEqWSZyrr0q2W0Ld+7oUCf9sdp8HNjEjV8rE7xhtyiAaxgeXq 6SOBixc/5ow1soFMPK6pk2n8YC+0KjGkITCowYpbXZo5htXfM0ORkKbWZEHPsrC2NtAd ciqg== 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=UgL1+z32PmDw63Fw0qVx0nZNPpxLPQLVmuk5DRh2ZrE=; b=elE1NuLvJ7FjHhKxiBkHWHCS2Xc+04Nk7cU/lFNBjlm9LXVxxN6OfkKnU/fwmDu6Hc mmCppkBi5iiEc2pl8AY8dKUsK2qHS1nlfswVT0l1DHG5Rd/RitGGDWVxwL1H91rBXL/H iVMWajovo55vHKwuhY3/NG2nweNJSV3MFXfMDhl6bWKdhhJ5MngIGVQmnaNckON18Dc5 I+js/q0LcCNRvikLBpteaeDuiF6B2Gkrdb7JWrjPc2FEKr2Irhett/MTVQ9E1p1pA7Wb 9507l381cGH1qMHpAsf++lYf2jdtlXsZOtjMkkM/27JnSgKQwIB3yXS+2AWQa0obhshs ymEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KnhlGk6z; 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 g23-20020a170906349700b007aee7ca1184si1714370ejb.602.2022.11.24.17.31.23; Thu, 24 Nov 2022 17:31: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=KnhlGk6z; 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 CB3FD68BB22; Fri, 25 Nov 2022 03:31:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C05368B48D for ; Fri, 25 Nov 2022 03:30:54 +0200 (EET) Received: by mail-ej1-f54.google.com with SMTP id ha10so7299663ejb.3 for ; Thu, 24 Nov 2022 17:30:54 -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=FZcJuuyHPG1d5T3c/30O02qnpcThK8l/GUaaX9994Z4=; b=KnhlGk6zQBfYTN21XeBvEIg14Cj7LWtWOOLePyInzh2ZWYNgEarjH4JdTxCyU/4iso ywmeTzJQUDE98Sa/Zl6OlKXQT90WYxnk5w9WeGm2olDqqBYAZbjGkrsznIl2fe6W4GXv rYGwNOhbmzfpmsViab4irMEbokrbXfp/eXoi/MX9cPYTxZFDQAHe5fsVW8tatDIaWa3G Q4pZs2g9Wfyrxd6A10MAwjTGaEpOzFkcm9r13dMbjisHAvgQVkrK31OE/mecuXDcgiRR a0PuaE0ARzZqSuO7yFFND4HCs+KJaj0Vz9gZinKA+xW91yz4mzlg0HgupfIvbuhrFF6P Ei5A== 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=FZcJuuyHPG1d5T3c/30O02qnpcThK8l/GUaaX9994Z4=; b=Qjpi6BTpqoNhPuon3gDRBlJkzZMxUfbvnLZE8EbHoDgfgILfsNmbs/d0GmfjNPTHXT 9EDbu090e7rinLrRhMyjX+IfIYT5J3C69solsCFX/ot/q+xK4PK1pF5S2FRc+rO8Ub60 kT50YcgsgjjAT7CeyO/4s81NJLYoAa9CH0O4C6VGp8k2UN9IhcHgt+YZvYiqWvNolxQK 6MnRKbVifBlJtwTQZIi0kH6A9ZEqhdszf2mEAFll0Gx/TJCopNlgYQAuxvYQtD16tTDk yovHUdqSD2vSKRmkIjKP5cubVPnuoyq91y43RfC0Xjaab8OfV4rdgtlblt7vGcERX8DO wGOw== X-Gm-Message-State: ANoB5pkXZH4iscxfRIEczk7KEWct0ItXW/j/aFVp14W6xelzwqzkQuSN 3i5R/QIIVnrRSeKNmZ0XbrpQydm1UdE= X-Received: by 2002:a17:907:a80b:b0:7b5:cab4:68b8 with SMTP id vo11-20020a170907a80b00b007b5cab468b8mr13234760ejc.685.1669339853492; Thu, 24 Nov 2022 17:30:53 -0800 (PST) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.30.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:30:53 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:17 +0100 Message-Id: <20221125013046.40904-3-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: Nvu2QQ5sx75b 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 | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index b0c4c8ece3..29794fdc85 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -972,7 +972,7 @@ int configure_filtergraph(FilterGraph *fg) if (simple) { OutputStream *ost = fg->outputs[0]->ost; - char args[512]; + char *args = NULL; const AVDictionaryEntry *e = NULL; if (filter_nbthreads) { @@ -985,26 +985,21 @@ int configure_filtergraph(FilterGraph *fg) 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, &args, '=', ':'); + if (ret < 0) + goto fail; + fg->graph->scale_sws_opts = args; + args = NULL; } - 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)) { + ret = av_dict_get_string(ost->swr_opts, &args, '=', ':'); + if (ret < 0) + goto fail; + av_opt_set(fg->graph, "aresample_swr_opts", args, 0); + 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 Fri Nov 25 01:30: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: 39412 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4948452pzb; Thu, 24 Nov 2022 17:31:41 -0800 (PST) X-Google-Smtp-Source: AA0mqf5BDbBaEMmu292T3M3pCuaXPPG1tJRSrMcpZerWRmGv9dQPtTDvIpMH0+OD9W02mk9HeDo4 X-Received: by 2002:a17:906:1116:b0:7b2:7af1:9958 with SMTP id h22-20020a170906111600b007b27af19958mr29951399eja.288.1669339901753; Thu, 24 Nov 2022 17:31:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339901; cv=none; d=google.com; s=arc-20160816; b=0XsHr5SB8Zz4sSyAmG+QyhdXIWOXMn1y78OZritsEdRFQ4NIUK4vuaEjS5biOD1NJn RVakl+O3Ce47nC8a8gatEmpKgkKoQCv+jFvuJNb5MOclQuuQQxSiqCjg15sLo9A2y2Qc h4ISuXKbGerxNYrczEXoJiTggaPaTWtrV3VDYslLfI0DevSty1wx8GT5ypGX3Vxbh0/e iZ5DEKOK4xNpO54oKIo1bBLTbtNxrKlHH2UJrP4dRi+H+7ZK4QbNUfV9Ae8gG2Pudkw5 PFNkwJLEuuNMvfFAPNyIryVxqe7GKdeMnkIOiUS4xSJz1fcK94vh7TRhuuubX12MryAz hdbg== 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=SRltfQskVN9x6vSXyhbfMo53e+tSaeMsmpPalfZQAM2W7WcbY4hP/R4aK+xzLG5OBx UVWLl49Qw+JRxAwr4w90tY+DcZ5gGWjah5b7safcPwP78qzsS4Zzjf1txjjsmB0KmzCs tRhUt/IpuJFumJMK8oNwggLy4BSfSGPHaR8+svTAOxI3eQ5iYL0KyxhuEihylyXJvJCQ F0pyLwMgNS/NtYjNt7xJMXTDTOYVbqFKH3IaBl+Ghpno/leTw9+CBQ24cXZIj32bwlbe 7MhD2od+BohJ2NNCeCxfZHEIge10Ki47Wbd2Jj+oaabczCgj3p7cqsweQdiQGtOYtwbl rvYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="mPB/2nqA"; 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 xf9-20020a17090731c900b007ae0ca417e4si2222452ejb.690.2022.11.24.17.31.41; Thu, 24 Nov 2022 17:31:41 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="mPB/2nqA"; 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 2B11168BAE2; Fri, 25 Nov 2022 03:31:04 +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 D20AE68BACA for ; Fri, 25 Nov 2022 03:30:54 +0200 (EET) Received: by mail-ej1-f53.google.com with SMTP id bj12so7182966ejb.13 for ; Thu, 24 Nov 2022 17:30:54 -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=mPB/2nqAwNGvODpwF2+n6Jk9rqCPDUiXs9H61As8Z9b0q70/p8WRNrnVDqJSry3/57 Zx8agYAK6w2c/GA625hVU5nQ4DqRAeTntPUa+9nfvCj3euw6/S3xxQ3rP7sxQpVzKoC4 icyKdVo37LAfWAZifAAQspcJjQnGgIXNhVYRUjob4jGoraAmlQv3zliw+U/Bij1TgRd+ 7Z3R8CQsmpmMCUU9BalI6ShHmAn3FGO0yiJWinW9xN4KkaxbDYgh9Fc4HFnDM+Tslqll SfiVor5BAbgsiUsc6SLIm9auUp34v41h1/oc6ymapGtcxQBRf1u446RR/ZDe52AJLAQz 9+eg== 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=T9+j3HqaYakWzyT+ixaOSluipVcdwBJRoFoSY3FmMu1gV5saKe1amVn3zuk2sVR5Xg 7u79LQsWM23gK+vVzVha3ozktuob3IpbnSnZquXFnih8x9O/LcAbxblMdKyRnorN0mWr Qws5gD8PYDSGzk4s880NxPo3Af/5tKezPGO91Sn5VTNJVfGP8uTBiIKsJ6hFmAReURfN cGo2aPa68Pojzy5NxdKEF5cLLFDUL7RpjmEoTk8C/rSPpvhUWZLnrv++rnMqbgNVd8Zn F3N2hJzrHDXfw5ZWvu65xvS02PM1vfRsijZ+D463trpjShv+6tDuxYIYRoayP3req7jH OL6w== X-Gm-Message-State: ANoB5pmzqx6stBmSZo+junNbaZ1tt7QM0+zCl4L2XN6DtTUIi4v8K/3V Ku2FxbUwPPfHvYhcay5dRlQhKUfjdVw= X-Received: by 2002:a17:906:1d14:b0:7ad:79c0:46f4 with SMTP id n20-20020a1709061d1400b007ad79c046f4mr29493053ejh.363.1669339854222; Thu, 24 Nov 2022 17:30:54 -0800 (PST) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.30.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:30:53 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:18 +0100 Message-Id: <20221125013046.40904-4-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: pgneuV5ODSz7 --- 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 Fri Nov 25 01:30: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: 39415 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4948697pzb; Thu, 24 Nov 2022 17:32:08 -0800 (PST) X-Google-Smtp-Source: AA0mqf5+1icSGw1AJbmx5gDjIyugg/rGwAQfM5VkiHGKl0B0gWhLnvl0Gr2YrRWzcZYn2HnmqHp+ X-Received: by 2002:a17:906:52d3:b0:7bb:4d2c:2192 with SMTP id w19-20020a17090652d300b007bb4d2c2192mr4256768ejn.416.1669339928437; Thu, 24 Nov 2022 17:32:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339928; cv=none; d=google.com; s=arc-20160816; b=ngIn6TbW5wH+UptO7taMlGATEtSS/jaUr4vuLzKcILVY6AUXhs3TmviKj7Av1pOF8F JhBO2gEcbV7fozDg2YaKVmqR9SDv51yQbvP5JoTg6PwZE2RYbCLGhg8LFmH7VqDlsWow lIweAnmQ8oR34lDX71V+Xksx2uPI5jlCWdaQ/CCuGknCPoaF69yq84bxl2PFv7uOXTI1 TKYhlOs6szZgaSb0uLlNDqBU8f2WQll71oQfAOuHFwYiWTf3LAoeyd0jgkh+/b7b1Oln 0heOqNWyriD7sx43wsDBtzM2dc1TJnrDfAfNJbfF00Vx4i5U25HFjCOr6oiKcyX2mDFP PEqg== 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=v+T0yPTvNwAGoaaKlSQHgZ5R7Kniwnu5UhLHAM2zeQ4qfn4iev8DfKWggWUIeX+/In y/eClTD0RDkXadEbyRJ/UNxffybpHg7C52pyN9oNYgAPIu7yhyob7XHcsmv+aRpj1uKQ nZwxEYVEL7WvOX0pxOr8vusNXWNdfldFSIZzrKl37YTh2dwGoKsWJTRmzRrwSKMFIOUG hjF/rH6w6k9fpUas1fXZI1mBU9Lzx5jPQRl6lFzPuaQ3dZekJBhHSs7TxLg8ee3zH6GP hBGr0TERcD20a5rWxevYJDMsf9E1BK71pmVNIl5NOnEHo/3Hr7tXKJSIvCxJmIf9iBCl Bh/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ExbdhNXs; 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 cs9-20020a170906dc8900b0078db594808dsi2155967ejc.588.2022.11.24.17.32.07; Thu, 24 Nov 2022 17:32:08 -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=ExbdhNXs; 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 7195368BB0D; Fri, 25 Nov 2022 03:31:07 +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 8CD1B68BACE for ; Fri, 25 Nov 2022 03:30:55 +0200 (EET) Received: by mail-ed1-f54.google.com with SMTP id r26so2408950edc.10 for ; Thu, 24 Nov 2022 17:30:55 -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=ExbdhNXsZkz/L/zEFWvhk22WHJnweXyPkL+Couw6qdRGUDKMoClnu86bCly1cIYg2k ATbXNWIMx4hs8gdz1bOLKs6IEibvZKyUyVC8KOYZ0dH7k6MneEa/s+iInVVALCtdUSqq L7h7l482hfzDKjvXNFef3D6drA2ytftav7VMnVf0o/E6uI+BdzTp5Zz91n3jB4zD+Nq8 1QHcBdYHN6lV0ZWu1MDaSH7yuekQ2LZJOdM1iYpNhsk32rBF5aZd+8Bzqo5BbIX6stpl mJJ5SADn7Td95/mCQJXmcvOvuxgy3EI40POX19NwLdYtbPv1Of73mMZvrPvfW2lQ9L/0 ENWg== 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=3h8wN99TuIDYOkVpEWRCIXGwIx6NEBAZ0an7trC2lMKAaBSj7d+JsSz6WHVqhcQkXL 1epeb30/1hvrK0PiQRrAtZ8aeiodWcRiDnpGCFbGZrpRIQi/PMTU7NwqyEPqdvg0IE4x 1dt2KV6IOpd34MdoMrpUKSPHbvvyeQT4J2HNS0fT5btA7s3x3L7guR1gpnch7ReJJ2w2 g2Mnk0trrOmUke7znUCx5Z6nlRDb9l20qmvdHBL0TFU1PqPmo7ghYpC56XAPpal4Bv+9 nid3ibtjYer417J2BAEO+MZF+k5UqNuTGG+0DANmf90SAt8leVkmhIk/r35H9pZfTIrh FA0w== X-Gm-Message-State: ANoB5pnWrTYKRKV4fNKU1vDF9+xlvWuduNKWVl1jYp40QlRKc7nKRbmt zngF8BFz8T2WwfoY5ZThiVBMrs0paCM= X-Received: by 2002:a05:6402:2a08:b0:461:5e99:a299 with SMTP id ey8-20020a0564022a0800b004615e99a299mr32510796edb.40.1669339854943; Thu, 24 Nov 2022 17:30:54 -0800 (PST) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.30.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:30:54 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:19 +0100 Message-Id: <20221125013046.40904-5-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: uxvHtfAFxTO4 --- 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 Fri Nov 25 01:30: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: 39416 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4948755pzb; Thu, 24 Nov 2022 17:32:17 -0800 (PST) X-Google-Smtp-Source: AA0mqf4cLWhlDQtqRiA7Cj94P+mkpFXlUI+03GeYHAm1N33+l2NDYcAaFdR6GDzq4Q+N9aGE+yie X-Received: by 2002:a17:906:cb90:b0:772:e95f:cdce with SMTP id mf16-20020a170906cb9000b00772e95fcdcemr30207722ejb.78.1669339937269; Thu, 24 Nov 2022 17:32:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339937; cv=none; d=google.com; s=arc-20160816; b=vAHmf7Kt6J6OjYXY27XVhugKbuwDTwngW2oGmG17ECtuMXbeFJajy0Hdqqiijx6is6 mCOX87opZN0Gu590XPYqAlBFiTInuJzkTvMRhRg9LnIp3j2i7MdbpqnML5hFJIRejbqh UmaKGxWENnwomAzdPZxKJ9T43HghnhTdl/XL/hqOJfD24H9fv7KkiTnJS8ZWtT7zSyQX gRNbKupUMfwRSjbEwVayMUlzrLferbMh09RcU7WZeUKq0vqhzTmX9j5Y2akDHaV5nOja zjnzwlk/LqwoNgMyNzsinjmZJoIr3Ml4TldazEOakn0IEFG1xfd2jZRD4Y4TAuRf4JzY WfWw== 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=P4FzzJQbC/t2ZD91xlcIsF1nIIG6fm4qnK10BW8hmnzgRII21vDmn1CdN7Iqgtc3ou T17apFbnZo0Cda3MZFC9OiswRlDPzAwH4xehtCgqqWQnBtO+69ijdfT02/Zs5R5ilcLz dvR8nmvAZSOCRndhCIedNiB1IowXCH3Jj00ZUiaGjQkYniUZqzChcUgYCZVqOlskeCfl d6RwPMbxzM1qSL6J5pzgllqq4IUHREAcASDL8QoQ4B0u6nPe3MfcjAruHi578Jgy1l4H kL9jUdA1zNIwNGpxjWx5TdntDJF3aXgoCgFQZE2XxxFDQvGKvdF8QupRT7rxHfjfGNGt l+jQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=a+8U7jlL; 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 oz20-20020a1709077d9400b0073ce34d1a13si891423ejc.499.2022.11.24.17.32.16; Thu, 24 Nov 2022 17:32:17 -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=a+8U7jlL; 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 6A70668BBDE; Fri, 25 Nov 2022 03:31:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 45D2768BAC0 for ; Fri, 25 Nov 2022 03:30:56 +0200 (EET) Received: by mail-ej1-f43.google.com with SMTP id vv4so7288740ejc.2 for ; Thu, 24 Nov 2022 17:30:56 -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=a+8U7jlLmFaVejrg2OkvkVqV1m4neXgRdNHrd3yMBVrkoqEP1PI/LKtp9fDeYuPNkm WWyOKujrXnke/szwsmOKVHvxgauZR6l7BzOoTIZMf3tIJ/MauldeK5j9SYCFJa5Re/VF bL+HPd0VOgKFrfIgGiYYPYDA1A36wa3F8HsuoWudHAIRt+D09YnfdEACtqaT+dpLrpyU qP+26xEA7mrFgsoYp3J7LZJGv/OO/CHBbEOd+nwbr1FtmBN7cTtzSpowIz7JStL2VoGp 2BU86IOVij1nbwUAnlmce4wE3VG869RgEoR38Jpd0hUr0avGs63qh3RUC5EWkKWIPaE5 fTkA== 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=hQqyDTETlJaRtuabQz/IsNyu4kFbYb5BmgZiJ3qrxwLajcDMfhNt4Wz9lmYYVyY5+r uVJi44IPl9lW36qxSumyu47mmNgHfewHgivf1pGJKA4cC5gA+MsZKM9pbvdwYAagLanu 7g+5hRF67S5Wx40wlbBPHSe/QsrTe+7wEWUkwlFCj40zcZRX2pHM3EKDhj1V828Y5Sdj Z9pWNJdHDtdzgnJ0HNXMJ0tO1y1JqdaA+CZTf0v04XG9DIwITqDKOBypNm8u72AuKYoL N/1oVz8zY5qSxR5fcdbKxjUwDS9YkSaJfifwN4MJnTiTtxnnZ5iDt9OQMYpP9it/SoH/ HbLw== X-Gm-Message-State: ANoB5plbfmXCNck6mwUvEL02gEYPI4tEST2uF2xbhai8tu2aQfgkTU5B KhIkdKLmRN26sqZWSDoi/XOG+q+wfJI= X-Received: by 2002:a17:906:a2da:b0:7ad:84d1:5b56 with SMTP id by26-20020a170906a2da00b007ad84d15b56mr30825552ejb.205.1669339855678; Thu, 24 Nov 2022 17:30:55 -0800 (PST) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.30.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:30:55 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:20 +0100 Message-Id: <20221125013046.40904-6-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: e4oVAKLHpSAu --- 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 Fri Nov 25 01:30: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: 39419 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4948978pzb; Thu, 24 Nov 2022 17:32:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf5CuyWKD2wWhzYutuJa6W9PYLBSLBw2OOa20CTNzodUSJgicYznpBc7gfzTjtjl0YhtxR2+ X-Received: by 2002:aa7:d718:0:b0:467:6ffe:e94c with SMTP id t24-20020aa7d718000000b004676ffee94cmr32154586edq.417.1669339962784; Thu, 24 Nov 2022 17:32:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339962; cv=none; d=google.com; s=arc-20160816; b=oRFXl2UfPxP+f+znWpRBWKRTg0LIyZ3Iocqj7dWDrWxuhjyVqJ4XXmTzFbMHd/1rCq jPyD5D9ba92vHT90DEqlZYt/HM79W1ENxTc6++4vjl3QsNepwSR8sLuG2GovVKjfv8Fs EdIdw9kgIU7QPDpExYXMM3yKisres5yzcuo5Ai3IPobt+QbXJ6UeifZ7XNB7s6mBWosy 2Mj841Mcns2rIIlkaDe5yX7bPjDopFF386ESovqT+RkmaOjHJaqqacgYoPOjXfRBLEGh xe2EpUbKbWvnlnkIfF840dmDiLpTckhOAAfZP6KmHuOiYQCJbMdvw+gR8suoW4CXdIE0 EexA== 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=zW1DIgo7hNuUAXAw8oIS2/21ESpIDYkmsLUqT/r7OfFpnlwDV37k3DuLCJHe9ZIqVs TXeQSqqndv4KwpMdqKvncf20Jo7FISXtEoVUPo0ZFisI4aIcMeOFX8tHYYX6Id0YYrUI GdQbZaCOl2Og55oblEVjPeJ1XXk8cv+cUludM9+f5wA3GWbLYkKJwWzop8segeVwY1EF unRMVSyQCOEC9fzpzuwvWuFDJZk5rkmOT0+2mlDuc2/Ts+v3sJCU7qeoKEuvYUAbEf/h orn4eaE3DOI/R0MlRHn+ljpjY0CMAEnhpLL+Gy1IVP6ABA8bmFwZOlF7aXt/z0TkXXvp SYYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nuogd7E5; 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 hq26-20020a1709073f1a00b007addc76341csi1751117ejc.25.2022.11.24.17.32.42; Thu, 24 Nov 2022 17:32: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=nuogd7E5; 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 8A4D668BBEE; Fri, 25 Nov 2022 03:31:11 +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 DA4AD68BAE8 for ; Fri, 25 Nov 2022 03:30:56 +0200 (EET) Received: by mail-ej1-f53.google.com with SMTP id bj12so7183083ejb.13 for ; Thu, 24 Nov 2022 17:30:56 -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=nuogd7E5fiNU9fw+C8ku7nyskcUgpUdMExIWJ59xVedS6PEwPkOpas5XREVnXGTVWp gAmtyJx6o6p30zYY+BdP2f5yZlmkvSYxip0UH5M01PxP7LBtMuGFeeqTgn7GHhnLYRv3 aZT66H3mm1SJA7aCIDDqqD4pfq/M0CXaseImZCXxNKzYpDhnGj46MIgqaD/OwTG4sLk8 Ot8KIwlrd5PhhqSCT+CLoxg3K8Fq2sRR5BLMirW+Pm62pZ+6mvRzdI60vWkwd2nIXcba AUPT/1blLNuHrpGikPbKzRztY1dLF/ZgaKvF1gD7R3q8TD1+jBD1mL4y6EI75hHw+42Q 0tyA== 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=nch7e2gLlUctC0w+8uTAzD3n/DlywhFalLl1lXB8O/UWm3Cki0ai072O4Yf2YTAqJY +mpbfUNPK8VTJHwd9+z+PAg2FVh6QsERoCTBIag4+coYFo9FFTI/U84f8BhNt8fi1h/S nBA9KbyK7u8PCUitkF3nooLo9AE2t7AQoMxSKeL4lRF36MLwudQJSnhJ49aT0hzIRiw5 9KlZ5jUPO3dWTIXukUyLDvgA9qz+fQ+unr1omPPDC5pHp3wKzPTxDYlTL3IuzSUduuZT iwU2ffC+5HXcr7BGbf5AiWeq6VCrJ0+RGBeaI5kHObBHQWUW7H103yWPI/cDX6z9dCam +vfg== X-Gm-Message-State: ANoB5pl8Nevut9UpT2XDNQYlDtdyMo/XdLKZ7rOKzs+an5emcfZsaQR/ bg4c0Ams/9mR5rj19S/xrRK6Sw+gCD4= X-Received: by 2002:a17:906:a10c:b0:78d:8bcf:bb47 with SMTP id t12-20020a170906a10c00b0078d8bcfbb47mr13622072ejy.525.1669339856368; Thu, 24 Nov 2022 17:30:56 -0800 (PST) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.30.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:30:56 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:21 +0100 Message-Id: <20221125013046.40904-7-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: zKPhipLWemp0 --- 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 Fri Nov 25 01:30: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: 39420 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949038pzb; Thu, 24 Nov 2022 17:32:51 -0800 (PST) X-Google-Smtp-Source: AA0mqf7JUzVexXRaFm2sdtwZ/n8kUxOO+VqoB1h+opOntqFmJ01MwW+ZKcYsJo6E0K6UiWfRn8jo X-Received: by 2002:a17:907:c007:b0:78d:b371:16d4 with SMTP id ss7-20020a170907c00700b0078db37116d4mr13294897ejc.434.1669339970916; Thu, 24 Nov 2022 17:32:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339970; cv=none; d=google.com; s=arc-20160816; b=vc8CLDBGpfJJjtXXBx3lHtHzTyz520zwlFTO4XMH6CXqq4CdOge+wKDfQvYaITC043 Aa9wwOAR0byFhu+sJ+a25JJpAEc8iG5eVGw62t10yG9CJ2fBr9SArO0YeLTMVn5cmgbq CpTmSPCjjN460k3qgranCp99x3eTDLDVSXcq3uBbw9zAqGp4aRdk5urgXi+0EAL0dtGu Ba1TwypamrfrrVxAXC6HvCu8ZyMArODX4SAtcO8hLiP+T5JTXqeLZXfISWJv9dGFIDTB LvuaXL1xybhKIenF3rEJXUzjUlSgxMCWBRvi0Q5oYSsSJ+2q8uy5b5ITFHwuTUINSE8X 0PQg== 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=wvlcb2YY2swnzURHPzLRycR5+g4DVTkO/bxbPkaB5hk=; b=uionsjIk8kHRklr3Fki+Dlu3SKyNhplfC9ZId1uzlFHYFftnmARpNK6raf67OI00TW /cBSL9wW6keohyBAisEBCnA4kW/Fin107rAONYmeT8UmaAYvbk+v0wzLPHVFyzdzDMD7 UcPIWVVCYJg/dOQXVFUSols7DPkIwhlKYhj9Opby+N9AlHqe2U4GQnW8N/uhZEFkEsY1 HXgtHGcMcZ0wjOTIKDrYv6z5RxJBD5khBPESDd71OJ+qK2ocXJnvsd/49QpiDKgXmA6S TuFrb5r4y6kYKFyDXsZKl1n0HJ2KGUpssziGv3gNfIAVkRmFXMDW0U03TOaYUik2n1pA zdyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=RBVFOCX5; 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 jr12-20020a170906a98c00b007919fc02ce8si1500966ejb.971.2022.11.24.17.32.50; Thu, 24 Nov 2022 17:32: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=RBVFOCX5; 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 7DE0068BB03; Fri, 25 Nov 2022 03:31:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95B6768BB61 for ; Fri, 25 Nov 2022 03:30:57 +0200 (EET) Received: by mail-ed1-f47.google.com with SMTP id m19so3260051edj.8 for ; Thu, 24 Nov 2022 17:30:57 -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=9Ut4aUzD+AIzd7FygX3waH6PQbnpTYBeNhaMOP0xtws=; b=RBVFOCX5cKvN4DAlYSDch9MBxPIkt5QBUrtzt9ljCWOQkGe3vXCKvIJaZ+hEfioabj gKpXoKMk/7IoS0aIlFKrQ9qzHCJV7DYGk7EdZ3dUrTbrXmA4nO+LFpCf/q12RUWxPiHo wkH8HYhoQVljbehQMS+ywgt53yYMQFnSO+W6E8KhVIWJYpuIp8Hmo35DRyLO4d5ABoNb ph6wldLE3ghEX7U8YdZq0mFEJ9kUSwrRwI8fn+EB9kc5Ixe6iuOE/SkH2th22cq3qkc7 P1ZF1dELdI3cMhpuUtVoOkGO0K8mn5aIl9an5rCuDJOLkC1LLs/7g4ELIzJTfqjWV6/v 3dbA== 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=9Ut4aUzD+AIzd7FygX3waH6PQbnpTYBeNhaMOP0xtws=; b=QCf6rFjopRYBrdLqBd1+ZkT8uwlXJdGJ9GMNKPEO1M0eTfifikO9V7pNND6mSSS85B fwTTODP2AG6WrdlsqjS+SynEWhJL69Pww7S+SCUBs5hOAkxFrL5JVZTKtgV9OyruVuL9 AbWSKQOrHv/+G27i6xNxPKc4Rf8KgOmApjSVI/3dtvYR8HcVlxjT/pGL0xzndJzLxTuS 1QF/KpcJ6OZ5w0jQgOgMAooJqt4lS8i/boQOpkOisiUeEKU25YnKWvtdse2pDzDbeHwX Uygu2UavBjKLXQ1bqz7jiDhA2CdXaiqsivOnTWWmBBTZXhPBczxrO7A8qvFBpTzSNUur m8PA== X-Gm-Message-State: ANoB5pkeHahhqhHwQlHcHP8go9DdQ49d3gk3usYwiDKUsua7S/fV2PYR 6Z6vDlxhqY5G0lEinvYuU+jthkLMOE4= X-Received: by 2002:a05:6402:b73:b0:46a:890d:b0a8 with SMTP id cb19-20020a0564020b7300b0046a890db0a8mr4666561edb.363.1669339857073; Thu, 24 Nov 2022 17:30:57 -0800 (PST) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.30.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:30:56 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:22 +0100 Message-Id: <20221125013046.40904-8-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: jEdWARxtnViy --- libavutil/opt.c | 12 ++++++------ libavutil/tests/dict.c | 10 +++++----- 2 files changed, 11 insertions(+), 11 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..8c05752ea7 100644 --- a/libavutil/tests/dict.c +++ b/libavutil/tests/dict.c @@ -22,8 +22,8 @@ static void print_dict(const 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))) printf("%s %s ", t->key, t->value); printf("\n"); } @@ -94,7 +94,7 @@ int main(void) if (av_dict_get(dict, NULL, NULL, 0)) printf("av_dict_get() does not correctly handle NULL key.\n"); e = NULL; - while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) + while ((e = av_dict_iterate(dict, e))) printf("%s %s\n", e->key, e->value); av_dict_free(&dict); @@ -106,7 +106,7 @@ int main(void) printf("av_dict_set does not correctly handle NULL key\n"); e = NULL; - while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) + while ((e = av_dict_iterate(dict, e))) printf("'%s' '%s'\n", e->key, e->value); av_dict_free(&dict); @@ -122,7 +122,7 @@ int main(void) av_dict_set_int(&dict, "12", 1, 0); av_dict_set_int(&dict, "12", 2, AV_DICT_APPEND); e = NULL; - while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) + while ((e = av_dict_iterate(dict, e))) printf("%s %s\n", e->key, e->value); av_dict_free(&dict); From patchwork Fri Nov 25 01:30: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: 39421 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949106pzb; Thu, 24 Nov 2022 17:32:59 -0800 (PST) X-Google-Smtp-Source: AA0mqf67yTV4YkBFW/jsq8pDoWO/5r/v3LjO1zMAY6jfhi3rLDj8DgLfvnCp3MnnQS7jty7TPDOQ X-Received: by 2002:a17:906:86c9:b0:78d:9324:6f18 with SMTP id j9-20020a17090686c900b0078d93246f18mr30401606ejy.664.1669339978892; Thu, 24 Nov 2022 17:32:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339978; cv=none; d=google.com; s=arc-20160816; b=MvStPLvIC/EHm1be6u9qkpninmamJhs6pFdXb7SGjM4SY2JhAAlp+9q3bs8yc9y+tQ vPjf+Xh9gxvY3Cn3PuvpOSJYhxqmDr6o3H9bcVAIprOU/BX7GtYUpdHqOYMoR/ycitmd drj2GlWU7Ku5H6MejokxLA+w0KJcEaGtLgOK2jimFxesjByPIbILDK4PNwHFEQwqM0df msKyM5BIC4FbLH63dBYJOucz/X810NJEEVEdm1KgwtD8+YPGFa+kwyJSPMil13E5P4zM iw+rglftzBsoaQSxvVRptrxcm+SeCHgmBSpt/iuUR3I3nMUO+Pb39k3+Tc8Qe9HnYfOJ sDrg== 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=Wi4eSpNDOh5gTIx7KrcMBhPRpd6SOWKA1+3GM6XhtuS3vRDb74LnkkOyk5LsDzImP5 F6C86XCdM4YVN2YXP7pM9rxwUTU1ObtndAp/OpPON6PKVzOKug9OepVs6Dj0S+4rBmOe CCBeaVmU5ftqmSiW1xSd4COv60dBbgggK4FNIfM1H0Zam0ThEGv07CtdBAkBc7WTnUwv zorQJTh5iudPcRzZJUNF9CfIGZVtKrSMt4oQes1JsU3uofPf5WeBzlRDr4IOEbYJDQPK 1l8gFTe4ijxv5cuDl+NgmcnwhkS58DK8AGShZX2Fgg9M7Mz3YMG6OHeZAHMUaxiLtHTx TZTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KMi3qgYc; 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 qb36-20020a1709077ea400b00773db351c39si1001110ejc.64.2022.11.24.17.32.58; Thu, 24 Nov 2022 17:32: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=KMi3qgYc; 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 91B8468BC14; Fri, 25 Nov 2022 03:31:13 +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 2DCD068BB61 for ; Fri, 25 Nov 2022 03:30:58 +0200 (EET) Received: by mail-ed1-f54.google.com with SMTP id x102so4560607ede.0 for ; Thu, 24 Nov 2022 17:30: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=Xaf189eVqt5JS+t+POl4R9FximzKrQUyDREGkxwpb5o=; b=KMi3qgYcMPyu09HKDJHaJRKhwTYJfryydphvKars30DwdcPrT5WpONwrFf0Vyc2ydj +51dNce2rraR/MjkXDVxypMYBdNIIkUO5zoYa9dbv2pr7qRI0iiw9KNVsXgSY5mO5i5Z 8Nzb2rw7F3CggUD9R3aIe7xntkB3OOUQmR/uSz8Sel/G4ZOpzDmKm1FAaMTHd09x7Yz1 TRCfPBM7m35jtYLC68MxiscPxSnO8pDXVixHWCGHNbuU4mwV4SDMeJiMKt5BpU9qVZRg s9+3sQKkbb+84ElPSbmupZRsq12k5I8oTt3/QONeSknubxr3qRaTmkoLCSgiSv1pAczz UYeQ== 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=0hHNfHqVMMSXYB9mZoo90iDdBQpCt4BfImCOj29ICl/ywTxEEAPvk9fiiSimsseHIV wKNbO6pCBzzrymvokCSeYXFh17fVawVtYac3lS/CjRQSgM4DYrsOYL3AKK4+iW/F8FXt lrLIMh6qYqEkpfwDNzl8ibvZqht7/5V8kK4T5WrQTET8RXbPGv/10SE4AQv9DpA2Arzj BI7IiwrTA3DKe7ptZyJYoaYjkzRwI0tVYmm5s3LAse2ldk0Vty2vOnPQSfwjkNmyRxtL T3Idq3dQHytvYUCRHD53tOAPRKqZiWJAnb+66UALW+f8MCvgPtqd9Bx9MByZUdngKobw Flzw== X-Gm-Message-State: ANoB5pk25KgLcAX4/V1E7/zOFR+zu2D7JeYQez9QHcS+evzZOlHR+1Cm rPb/1WkB6DGkRuhB2KoWHDIoLCNXzg4= X-Received: by 2002:a05:6402:b88:b0:46a:9815:d1c3 with SMTP id cf8-20020a0564020b8800b0046a9815d1c3mr3460801edb.205.1669339857737; Thu, 24 Nov 2022 17:30:57 -0800 (PST) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.30.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:30:57 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:23 +0100 Message-Id: <20221125013046.40904-9-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: 8CTbl2KZQGul --- 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 Fri Nov 25 01:30: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: 39410 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4948382pzb; Thu, 24 Nov 2022 17:31:32 -0800 (PST) X-Google-Smtp-Source: AA0mqf6I5qmqfLWRVNtPEoK/A8kC0Mi2kGGmjYdKTpY5wu8RJCtWi9HjcIuyvTYJAY/kFxWeFczb X-Received: by 2002:a17:906:8252:b0:7b8:3098:a067 with SMTP id f18-20020a170906825200b007b83098a067mr13559807ejx.701.1669339892560; Thu, 24 Nov 2022 17:31:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339892; cv=none; d=google.com; s=arc-20160816; b=Diq08DbC9GqkfmH2WmyfwuOXjclMoDHQC9qYMFTrgCAjUwtc1H+DzNIQtcgSBmaQi3 PYKTMpWv73j773s7y7BNXzVaep7xg0zM4gcxHYBRrLr5IJS3ybuv41UoP/OVUBukxtAh TxCyIOn/42hCLBD7X1WI6u3vmwPjdV2Jv24fpfCorkcVI4SwY1gR7/5GHQ04wVEwPyHc sz8iay9Kmg/e9H9MePdQ1xDmv5DvywCI0jQDgPJuadW9TgjTUk+3IupwwIZDG7c9khCR LdTYjuww3eTbV5VzXA3h30k35GtnB/Z5DJTvbAHd4ILTImnkCPB39UofGIIBiCkL9k2m 4crQ== 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=jZV6ihQquUJLeCaKQyMSidUcUw8PfWAJATCW9kPZerulrp0cqHHKnHneSBinOsz3b2 iq6GhG0jhr8zsilCF6rjjwpVADR+yBl3pKrryxO8G7/pfDog8Y+ghVfDETb2dsou4cMB jO6UEehGGANZ2Gs2B48we/34atQHbAVeBL179zCXVTBS7YN859l6f7CH7F8CCsJt7gaE x/RyEQK3QjlIBSj8yWZkmxx444OeaVM/OQ9bMoyWwQm7dsAnsEn3Xe+w1HXUMisen8ND s4uu+YyblzBlM753iVKzFI0ruoswsY38PwL19G43rmmGFSlc97pO4ehIS+1JtC61MM/R j+4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=CTdjQ191; 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 eb5-20020a0564020d0500b0046a711ae23csi1751004edb.515.2022.11.24.17.31.32; Thu, 24 Nov 2022 17:31:32 -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=CTdjQ191; 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 D17DB68BA82; Fri, 25 Nov 2022 03:31:02 +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 3015C68BA9D for ; Fri, 25 Nov 2022 03:30:58 +0200 (EET) Received: by mail-ej1-f49.google.com with SMTP id ud5so7276858ejc.4 for ; Thu, 24 Nov 2022 17:30: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=pB6rZQ8AAc6k9zkhaEvwhA73YWfzxGi7cAx3LLPAXvU=; b=CTdjQ191EjvFj/jqTaoyk5IJyU8+rhJtbA/TPOYLHtTAmlMNU7yNhcWKERafHCNrUP dP1X9CcM95K1ZYpPzafIPiGGUFXWPr5D4d9WLD5Xb5r3/VQjcNJp+ykinQOifnLou3WF 4IR+3XaKxg7kjxUIbDgRJ+Up1JMOzVmwUDS0lmZ3kaE5t/nE89T8Gx8Qwu1at3eHzLJd yNAnIMnMb2neT6m3/MIlNd0RjPI0T5ugaimEKyZrYBB1udqQoRdtRJRpnAALJ+2/kfpy 1qAA4Mr1mSje2cvfvTGgG9eLTIKeWZrNNTBg/sYw9f5xP8TaMK4TM4u/V9AsKd3/k6aK cp4Q== 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=GQLYQK40svOF5Raeb1R98LwnoW6vUHsTwH78w3IraOJ4anynN4RHV7TGjLM0ZPgu8I KdvGsbCh6VrIM1efjerbLHbkthcY1MgbKYQdoyDiJ/WovQSDZlQ97OU3BCcZMXBM4tXR fStStGbFwNHZzMUABlKJ4IgyBeFx9PNSmd5yPRwO7CMSf7nomVcv4hAImhd8R2O6MZaR v+et6harS1XEzAUFPhhljIDGWZ1chBdkvM/JHy0wQakdaZMhBCxFtX1s27aFM5tOBHmk yjOPv5tRUwfIKmD3Rode3+boDxV1kwgo69YTiRBtY9eM1QXICLLPYFYWVGxl0AzEWCK9 KPHw== X-Gm-Message-State: ANoB5pl6rJf2KBL368Q9UmqkMhb8itn+/oJoBYn8dRnV+k2dyNND5BSv hdaRUNsK/Ihnoomb7LpA+kWekf3xMLU= X-Received: by 2002:a17:906:1244:b0:78d:d4ca:21f7 with SMTP id u4-20020a170906124400b0078dd4ca21f7mr30240835eja.128.1669339858381; Thu, 24 Nov 2022 17:30: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.30.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:30:58 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:24 +0100 Message-Id: <20221125013046.40904-10-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: /k8AIVR+QjAT --- 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 Fri Nov 25 01:30: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: 39413 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4948526pzb; Thu, 24 Nov 2022 17:31:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf6h/vshFUoqrh+23qbKaHugGCltCuZaZSghWHgXHJhuoArq3iZ5IyLD2lH2Li/lfDklKnW5 X-Received: by 2002:a05:6402:2b8c:b0:468:ebc8:7476 with SMTP id fj12-20020a0564022b8c00b00468ebc87476mr15244080edb.223.1669339910134; Thu, 24 Nov 2022 17:31:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339910; cv=none; d=google.com; s=arc-20160816; b=l12BNefcEXSU/+azdrz5g3lkbWtk/g2EScTtK0P30MSJoej+6/2XaPzP0QADWJ9HPb 34oYw8Sqw1FBIAkvvG1aBg0tkELDmT0Zt6MmfIsq6AARKSKrBXhYKUKCwGvqLU2eQzxM h/KJhZYVKILD/mXs5nJsIA7WHWp8Xj289b/CcabLGbrps2HaXpEzS0jOXP9iHsXz0Ahd Ga6Iocedu4SVhwUZMLGqnGw0yp5IJ0tGqKF8yR9PEDc1+HWPEo753dqnZuv64xGAau7Y cJ1vqk70uQ/eweyW/Q6PJle6HBO1TSvI6vqcoq6YmwtmkZ/kvuOW5jWEh6HPJ2Lu9um2 x0ew== 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=ecruAqGToogtg80eCRYd1T/xYfG4vrmWsf0gCUESOBqUXwnOhxBOc0lmuuLi8MKGRz kILD5sIljOc0fD+JBvHzXX/h5BPdFp/sQ6EzQlRSt3tB31RDrCmcrVOrQNRBCNPhEbHD MyrvcRBPOtBC6CS6abfDDlNEPTO5q1zZG3BA8HAL+7OiuWbAhQGskJsnnvCP9cSL/5+a KXV5pqtlyx2ZQXm9+UjUG4kXgyLlg3Ju6QoeWFUJTg3eEKr7KJaAQlZ4U3FfNJkJ5Dgu yp1C479xbN3dxq5bOFHlRUE32zySAP+HQ2WqU8jW0H4soegYxkZB6SILwH9T4gZBAFp3 nJcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=oeBnhc3f; 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 nd5-20020a170907628500b0078d9d67841fsi1951199ejc.400.2022.11.24.17.31.49; Thu, 24 Nov 2022 17:31: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=oeBnhc3f; 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 62FF968BAEC; Fri, 25 Nov 2022 03:31:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E79BC68BACE for ; Fri, 25 Nov 2022 03:30:59 +0200 (EET) Received: by mail-ed1-f48.google.com with SMTP id s5so4459301edc.12 for ; Thu, 24 Nov 2022 17:30: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=KcRM04mJHdXToDuxlBO+aJ/ZBx73e6xtKKloC+b8x5c=; b=oeBnhc3fdZifzwLDHVWvOH1T6Ig76kcP8gCYUV/z14Jd8PZS5ywOqdgu0sgHvzzDAS 53Ipsfn/eMqWCvc1hO0mjh8Q1+Qhnsiia6gx1OnspgoJ5wZWCJ+o6eYMqJteiYLI9vgM +VaZJsq68E4XUcJ8wbGx/wC5PP27CuJXtrThWgXZEh50E27B4U4iDXRPECxLc/uoopwt xGHmtKEEdslH68qq4H+VAl/UOtuyanaDKJ5niqVk9qfX9bVk5BtBTA1Pn38h281enLCE 9RK2xyJr3rOLNZuLDClu52h2ts/Wtb4PeDnjxZoCnC5cng1DjojqnuH6H2WlZRJjy9f1 XmXQ== 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=iLXGfOmSKbo+TqZWVv0AGjatIqLb2MrhHW0pGow16mw8Ubc7w8o579h5G5n1STCJh3 keI5FQidV3dirZ70sYPHoP50LHMwNsp+QjM2vzoz1ywTdcoXhzVLap/pTZzvMy7zhKqb 2ycPMGMMOBhNqW0Dkm3/Eo8oqQtjy9wlwpDbRzG2PPLsWXI0u5LsavQTCzLtDl1N91Jd DMt80o7b4kXqilEHbbNVH5dbO0gzMhLq1P9J/dAM5fusNAABX+SK4nTcEEwGOK6xv4Mi 727mDiqq56TqsxhTmp9EOE61HCS660pssOtXx+5hmCR8SzdZIlL0WW20jdkXExeFN5g/ Vr1A== X-Gm-Message-State: ANoB5pn3Ol3BaoslxjoN77zWn/gAjrYmhLqRgvmykZibtdwC/XiQGABr wfbTg9VD/2e/TvxY1crStQTWIgZHYAg= X-Received: by 2002:aa7:c7d5:0:b0:44e:bee5:4242 with SMTP id o21-20020aa7c7d5000000b0044ebee54242mr18992684eds.128.1669339859053; Thu, 24 Nov 2022 17:30: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.30.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:30:58 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:25 +0100 Message-Id: <20221125013046.40904-11-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: eXhgSeN+zzpJ --- 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 Fri Nov 25 01:30: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: 39414 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4948660pzb; Thu, 24 Nov 2022 17:32:04 -0800 (PST) X-Google-Smtp-Source: AA0mqf71LAR6SR2nhuBn3yqtRRB9R0U/jw0MDdH2LatEr9RymBnR3brMdDLj0bD9Wx8WHskmqdtx X-Received: by 2002:a17:906:707:b0:7ba:1ec1:ebfc with SMTP id y7-20020a170906070700b007ba1ec1ebfcmr7753804ejb.768.1669339924465; Thu, 24 Nov 2022 17:32:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339924; cv=none; d=google.com; s=arc-20160816; b=WP4e22/LKb5dpkY1rkAT6sKedu1SHY1I+JRyte83dug+X37WWDRiEad0bgedGecS4Z BnMvUWn0gnTO6wORhqN97xrhXOLLm017JNyw3FTwH8iCUZnDMVYyFbZ+xbJxKT/h0/P+ +B9nt8blFHtC+dpkgnolSAL+VvHMmoGh19+A5sSj/zvZ/BU8h6MAC85UdYZ20YIgpY03 NJ/5NCVtuwEBvE7wr5BJenqDooysyckI0FmN4mqmf8WouzXdx3gBUPzYeLBsF6zJsbFH WhjFKxTllxWsxBhG6n7zJU4CG2KbCytGLW8VQj/BsfMj+flWI+P5iaf0OjghN+QOsHrh NJAA== 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=ys9SiCe02Ky0a3grZzif8NRAi/5vXbsjfCfsi2avGTBDHDla2JkLUSfwneUuEA2otd hDqSwd5TevPF90OI5Vm+ZJlwumis0pl2GrwlO1h3hoa+vPNhfWbmjf+STw+vggu3X6EV 7wbdc+AGt/gqUjrPcxTwuhw39I9JOPt+YH1+1EbriqjFKRInFNk/A4kgC3mgppOilHkS 0EbSOu0acx8e39FJoTjFEsWF7c4HJQQGUv9qbIOQ+GZDhG++QjvCOhPPMItPBDEq847n zhUS7BIKe5URPaVUhDqeDU5I67gzmT/CRbxP1PMPaa8I3hgh7fkp/lQ21mP4hPCzSeEt ZZKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=hiC2kSm6; 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 ne39-20020a1709077ba700b007b2a6aaff06si1291781ejc.50.2022.11.24.17.31.58; Thu, 24 Nov 2022 17:32:04 -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=hiC2kSm6; 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 708B068BB84; Fri, 25 Nov 2022 03:31:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3089168BACE for ; Fri, 25 Nov 2022 03:31:00 +0200 (EET) Received: by mail-ed1-f48.google.com with SMTP id s5so4459327edc.12 for ; Thu, 24 Nov 2022 17:31: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=cF2DCM2JRagVDlYLtkRXz5cNc+IyCzd/BzHkzx5Fbco=; b=hiC2kSm6A9t4bdJ32HZD4INZTJf+t4J1meuLHiWeAQcUj8B8wxxH8Dsf5/HlvDORSd 533piKKNUAyrDn4L2tAqrf+1WhLeh1tKW3fg3WRUROW8Oz8HWAFl/Kq+7pItRsZPeM+s 0s9wNmL+0IQAXSUZpQmad5eOJgpxcXUWXsXKnAiCGHM1kABp91KrtS7BV34ndnTOxF/L Ffsh631xXq+I15IG/T/sqEwFfoyaJCRh1GNFUNmMTXQaqSLj1Q/UrPW0U0+NeST/h6vT iBhGhEbMtaSzMD2jtplPICHbnifcNZtTfj0ZiuFDsoY5tzYkiWT7ZC2iLksACMMBjxbA SaYw== 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=N3W8xEz30G+4JjwLEZEAw1Mr80/XG8z0v2k7unIGQsjFop2SWCId3v5XKHVfavpOJC 45eIfnIn911EgyeCXSR/tfIGKE3RPFTK6+ogdmHtaM2KCK9qqIloI3gWjIWI8nwAwfjj 2VToBBFsiPK76spmuM6mjUr0njqtBV9Yj8O+1UFgTAdW6FXAk4/6ggoV++gixdyVmS9X hnqm48VtBraDbn5v4J+9Ga/q0fH7QshOahFf2p6RWQBGn+KtuGEKVWkRSHElBLNdqobj 5rO6ikdrALWKlQH0dkyxkwykceHvkHi4+8OYN7NR4Vw6GoX2v5K3b7527Mnu0xJ0xUEM jmHw== X-Gm-Message-State: ANoB5pk7+sh2haAwyZpWbOOGDgNWlaXZZVH5s0Db4tDIlnTBk9KKK7TS GjTSIhkdGMh6/TFlz22llD/OkWb4Ajo= X-Received: by 2002:a05:6402:1a:b0:467:30ad:c4ca with SMTP id d26-20020a056402001a00b0046730adc4camr32840736edu.285.1669339859894; Thu, 24 Nov 2022 17:30: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.30.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:30:59 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:26 +0100 Message-Id: <20221125013046.40904-12-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: eLV6th9CR12B --- 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 Fri Nov 25 01:30: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: 39417 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4948840pzb; Thu, 24 Nov 2022 17:32:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf4HjdcKAQpWEvytrfvEXZpCLyaD/Jbej+BdAKiqpDPVUhGolO8FvLNrs1cGODHQhKqQkdZ/ X-Received: by 2002:a17:906:a0d7:b0:7b2:7af0:c231 with SMTP id bh23-20020a170906a0d700b007b27af0c231mr28918180ejb.240.1669339946501; Thu, 24 Nov 2022 17:32:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339946; cv=none; d=google.com; s=arc-20160816; b=m+yCxHptwQhK2EO5xlProd2KXmFs8kN+X3xxkA0lAiGirkLiJfN2xrVHG+MPZ4BUbX BDqUsCmLcRwm1xEa4UmzZT+F4++4pQ/cofjCQkF3h17FIn/BXaNDQy1AEvu7dGKGoLMj M0Yr8VTBXNb2m8uCbTMsqP5H72BcIh22NAmYYTZYWX9DzVfg8nxGNGyjtHj0nmPLBZRQ t3npmM4l3s4idvOZJx6EXWlDc/EyA6J5jHhbqKzSUChf5z86e8SW06Og2AMo3YXQjP7X 4oQ44rVfsJAGyex73ItLkmoOHiRh7g6SxYs8FNXJtwZ60YEm8lyLTAL/QqwTW1IOIAYL 4BuA== 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=QrzuqgStcr/7YwD/g75bFeJ71gT/buINDcZqNwHTv2ihxrhKg9wOLyX00n5Uw/MykO hBpR7US8Ud4UnAGpNvJLbCgA/oW9TZIxykBbrNri6aleOO2iLxtuvRQExTuuK790xl2O n2Dvz9IJW5RJzSd9ts48J4rSYaqkWA/8uWK2BQhieYQdAmC1bFIccfydQ6eu/9j6pAj8 HYrOaxgjexbNAj9N4y8FUJj5KnegAX5SewaiB73V/GD2UrH9BBzeP3HIi/TSrRXL56lZ lyYnfnROO7DtfUVABwh0W1kTb71NGtbZyRFIIP7HoFWoCiSUrvnj7jgMRnTsUbG7nAAX 5sTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=DM783Yuy; 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 kl22-20020a170907995600b007ae814af686si1528039ejc.974.2022.11.24.17.32.26; Thu, 24 Nov 2022 17:32: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=DM783Yuy; 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 6DCA868BBD3; Fri, 25 Nov 2022 03:31:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5192068BAF5 for ; Fri, 25 Nov 2022 03:31:01 +0200 (EET) Received: by mail-ej1-f43.google.com with SMTP id i10so7248393ejg.6 for ; Thu, 24 Nov 2022 17:31: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=0T3GmCt5crLf07hImSNUBki7vfPbvgucLcdCCzkuCM8=; b=DM783YuyWRkCzTxZWZEMHzIMB6hCfaLpxei0lGBFsjgt8CwCPjqaTBONS1PnHTfsLW mhs+e/JIm00re6v7bkrYbuUxRCzZnbGvWYqmDGAd6NcmoNPzWiFQgQWQPfSaiEOSlx9+ IlU3kRj2f4LXyowPyiEkkQiNKCYlT5egHEYwPtL7cyFpSoPqdJKHQiVTTjB/mtdLZi1u 52ZpbmCzR0N1c4YaxrIcV8n4ymSDuKI8ansTAgPEVtDw3n1RgX9svKliPo8swpZa44hP Aoq2iA/AHDD4EIJ6v6/89KLJEj5lJ+B9u1Bch7kA1Oa9Qzh+xO3P/9sH/hO6at2RpZ3b vN8g== 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=C865iOhL3AUk5vvo4NoXWXAKp1sEYc16A2JuRDNulTrHnzZyvTrqE9obcVPotpdsxj yUuRM+FngejRFL/LwOvaMlad4gmHlJaTO7cePG5KhR6KbMXSQs8qPLUuPMVhMz7Li5SO BEYU87DyuYKFahJsPcBKk/He9+WRiFCJ6ZvSkFxyh/EuUqkb1mwPM1Do7KlrqtCLrYcI Ey+3DgVVnStsPP67e45e5O3i/lS4foVpKuxOoT8zG0AlKzCXgv0dM60RtCSOc6CGbk6j PToHal6R6uPkw2hO1JWZZU7r1I7fyTCQeEX4azb3/YI1Cx+XbPRGEV67sgJaPaY78vWp kPHQ== X-Gm-Message-State: ANoB5pmllm7OkH8Sj0wKeulVQsAbJvLixKRerhXNQ+MIGAB2bdoNg6Y5 /wzNN5K/eQcWMtaaewUgQ4LDB8DJjsM= X-Received: by 2002:a17:907:774e:b0:7ae:39b4:7208 with SMTP id kx14-20020a170907774e00b007ae39b47208mr13852927ejc.766.1669339860689; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.30.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:00 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:27 +0100 Message-Id: <20221125013046.40904-13-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: mg+/t1LrstSx --- 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 Fri Nov 25 01:30: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: 39418 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4948955pzb; Thu, 24 Nov 2022 17:32:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf4I7R8kZQMUjjl7/X3Q+JebQR0bb0LXe8yEIWHtWToh49x5mPH7RrYgKzqKsDC1JeW1dwSH X-Received: by 2002:a17:907:a709:b0:79f:cd7c:e861 with SMTP id vw9-20020a170907a70900b0079fcd7ce861mr29074750ejc.339.1669339959793; Thu, 24 Nov 2022 17:32:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339959; cv=none; d=google.com; s=arc-20160816; b=Xe/oDYOzl7m4j4+RJoP1FEam/9g+i5sBFCZHWRZUusgH72WzzCVyizzd5RQ6Avy99P XyUcSbXYxuaOsD4RAZ5hv5Q2k5bG7BRK0ksmhku0LtbDCDPKWL0gF2zImyluwLN08yAB 5EFiTP/L7loX2toqfSdMhxPV19ISp/lm2oDzZOd9T1oSKl1+471ePfRJI+UwsqDn7ubu BLV0zNhqVh8MT6j0o7X3DgN5dI2Mb0qC1nVAy10P8eIDFyvj78qnY6NUU96e/40Yu8Yt tNDJOeZPzNBCpEWCX8fX2Zxus3o8MsJ4enaDCAxMw34UcABxMRx/NaaJH8264Gq4H72g cPVg== 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=vEy3qCWAbStd66TRdChpzId6HmmzmYfudvMouCpwzlsJu9J/vgssadznFt4hXw8RC6 JatuO93xKExzglc7LiiHEMEiJdUWicdVFd+Jivxl+3IqoRfp2YRmOw3297p7OPr84NoB U2ZMnTWN/sLmewXxteAHAJNLCaDpi4DCOoqsahiERXvXMYcCWSziafMc667She4hIfoa KNzTENcxsXguV1esRgxddh7DbqaFJiaJmX0OmJipQQz0SiJd84+Lp5osKufTqvN2eRqH 4fHrx9FJr/btDMXo2VaHTfOzJFGs2OUPRYz8QV8Xt2mfC6cl8Sy701JPYc4YQt6F2iY9 GRdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QCFzSL80; 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 k26-20020a05640212da00b00469c41d538bsi2004264edx.180.2022.11.24.17.32.34; Thu, 24 Nov 2022 17:32: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=QCFzSL80; 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 89F0A68BBE2; Fri, 25 Nov 2022 03:31:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC14E68BB07 for ; Fri, 25 Nov 2022 03:31:01 +0200 (EET) Received: by mail-ed1-f48.google.com with SMTP id s5so4459399edc.12 for ; Thu, 24 Nov 2022 17:31: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=6oct+V8mPf3l4jKBQ3gtYdX4r5BJZbkPsD8tlvXu8UQ=; b=QCFzSL80kUebbQ3XIRd0vg+6wwRrpb659scf7kijJ8ALwtob9Z/djJMxxiSpkZcwUv TogGNtJSk8gxd+fp8f49GuSSqHowCfQUD7JLws6KcgaeiVgQncOvgnduVNoi1YgdYWro IJmuwz6UB0Pk2qtSHcK2ktVOaA/M+mXGCrmEH86+x99uu6vlO+DEIjyZxvJDYVbLyZuy OV6XTRsn8wnn8O3f/UR1knesIEP1Dv5UnMp0oLjpAd19mIU9+LH+KfJwhXEDvci80MSi kq9ICVWmiGq8v+2sp11PC3hFoV/pZXXXz5710P8hvPBqmGTCVFoGcWSKPFgR2BYpRF7p VI1Q== 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=Bi6ZzFE8PN+ZTC+17EIsmCpFyIcVmaYAuByTSGGySyCke+Tr0OmJ7WmqmX/X/07hSQ a8iVJCwXu5CIcI1VuP5vyRR3IKA60SNDaAocen/6UmMPE8sxrCCTb2fxIakLL9fb3/Zr S+LX27WkpQAhuui9O3+nV1+6XZ3OgFxjbx6UDMJ4cnUPY6za5K9uEOwkReCrRLW++vGB FY2rrfkHJvS5+y4kclATBP0bx2lYX2HJbSrSJqerhf0zOirVTRiPqCLCw86ztHYoQB8+ bTpFb/csUxg2UjRdEyMdbFO6VZ81rD+CgcvKelz8136zGJ2646t378uoUO1zwlA+zro8 CFqw== X-Gm-Message-State: ANoB5pkncb2C/EYSdGwE9w2TWUtExjYr5Ayr+oaqQJG85FNEIvqgZNpZ uRCRh9tA3CIrahyoexE4oaBzt1q5YPU= X-Received: by 2002:a05:6402:4516:b0:467:b88c:f3af with SMTP id ez22-20020a056402451600b00467b88cf3afmr15705543edb.24.1669339861562; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:01 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:28 +0100 Message-Id: <20221125013046.40904-14-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: LZCRUCvhiLZq --- 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 Fri Nov 25 01:30: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: 39422 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949169pzb; Thu, 24 Nov 2022 17:33:07 -0800 (PST) X-Google-Smtp-Source: AA0mqf5AZNpn21OCmSCuTVS21bm39fojXYc2fc5PUtLaKwGCY6X+zYKCEiv1xBxYLhM5EetCrmk1 X-Received: by 2002:a17:906:15ca:b0:7a5:7c1c:cc5c with SMTP id l10-20020a17090615ca00b007a57c1ccc5cmr29799253ejd.644.1669339986804; Thu, 24 Nov 2022 17:33:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339986; cv=none; d=google.com; s=arc-20160816; b=pXbA+xtDOMKE5g+nAfahiVI9bC6RReFGZjPzUXxch0kmknAWjBoDVqZIBJQNF0JCrF z1zeLvRffotKK/OLEBwz7M4j7875mGtTNZCBmp31H4ojXuy20Rx5hugr1QMtPnQv95h0 kbjlDpcPVKrURZjPFpjjluj9edZOcb9pLkVJFSZlE0cHFJQMNSApKw7hPFr3ZzjGVoKH VqSlzv0QZ4WI4YrHg3VawdXvK9eEWM626H9qPCzenvnzwQbcxy7RWYjLVi/G7UdKtpaz Cioh8FQhuW6GW/VrawOJBQsGzjVmWm03jilwIvH9q3lZP5fpNYbZ8undwUcm3RFtD33A hMww== 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=XMCbLioio9tR1R437HvU42RMU+Jkcf7SB4UEN5Sqel5+5CufGUWGUI8AWSugXrJmyi 5KwS6CAQFK24fjKh/mSngAAV9MzA7wIX89sA821DpwdHO7hPZKHKNJjknIg0IIqsmevq h9SxBTXBwu8E0bM368aZjURPFZAyJdRG/4hSqK9OzAGcJH0UQorwFyxCJumnVmWOOYAH wVuDRyBnBovr9rq96DZwdkGu7iqtMp69zIquz11JiVFRxfAsVlPETp4eHkpWiuBZIxg6 /WqauH1BXq3OYUNucmJ0IA9BhmwSwn5uAmUGOaQB5hMqkTfXBCI2q8TXmVAZG9uRgMUZ Nmmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=X4ivk0T0; 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 x8-20020a05640226c800b00453b9f11bb1si1199421edd.206.2022.11.24.17.33.06; Thu, 24 Nov 2022 17:33: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=X4ivk0T0; 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 B137368BBE0; Fri, 25 Nov 2022 03:31:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B11C68BB03 for ; Fri, 25 Nov 2022 03:31:02 +0200 (EET) Received: by mail-ed1-f53.google.com with SMTP id f7so4498118edc.6 for ; Thu, 24 Nov 2022 17:31: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=vaEtfww3TrHuT7bQLZ6OqR4o/z+mfSKSTBJiTweB6lM=; b=X4ivk0T0vV+qIgoERST8j4I8+vQODZ7p5T8e8hBS9pOyUR9Nmm1hReV/fqpvCSlDTd qO7TArWksKDMryVO2zKO9kPOEy1iWuwqTYYl8c55/1vGLEdkqgYNjfmdmLhoqG20/Zzw dIWBr0qjMYsa0nZBlZtNxUEPIXTItBabhNj9yH8zHNMXYwokFdAErCjzKv/Ut8TXTRpi tkI2oDIKwCr2Ffm8AtAJn8vdG6lcIf0KP6iotowHUYwWMaITnQOkcHIHm70xfTB9cIGV rKXRRGHTL3xnFC51KIVikYWmdbVev2pAsDZRWuwU5DP8X1RyoN93JQXEEqIcKUoyc8GJ nIaA== 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=pxCdB/JiRnZ4imJJObCck+x3uadtwQ4qDtJfqKgFdiy0OjgL8FRn+ggkzKScMw4c4v 7WYgB1Fj6OzSsD8NayEEiLFEx9krz1svY9x6/kW8WbTlO6vPuJVuJWxGCorz15KNvpSi zeoxazOy3flX4mqjhVjAoR9OPQz0Nhr3GuvqMjfNeqKAQbS3zF813h4KdPW2vWRN2e9a 8oNBPGnSgI5gE3OE1ewZSicWNgos9cbCGOxXr7D4AvFYloq7Y4pcYoRR52EWqjyGjTpf 9B1LU37sNo511SqBYqjD7AuzKcvHOEOCMBUfJZei5Xy/qvroEe4XPsTp3KNGdyThpBsw m1KA== X-Gm-Message-State: ANoB5plYQaNQlqQFieSYjE2SKNSkmbJxNkXcJzHUhCHLW4+4SBUUBQwi 3PbfjCOEqCZtZRR8RcCubzJST/6UvNY= X-Received: by 2002:aa7:d7d3:0:b0:469:906:2ece with SMTP id e19-20020aa7d7d3000000b0046909062ecemr18556012eds.342.1669339862352; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:02 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:29 +0100 Message-Id: <20221125013046.40904-15-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: g69szPXvdos1 --- 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 Fri Nov 25 01:30: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: 39423 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949234pzb; Thu, 24 Nov 2022 17:33:14 -0800 (PST) X-Google-Smtp-Source: AA0mqf4wyFa7D4tlvW30GrMUHJxIqxm+j72ZIdt9/+pihkn2ng6M8bZ9iNrnuOK0IcgKQYNy366v X-Received: by 2002:a17:906:d782:b0:7bc:9d14:a2db with SMTP id pj2-20020a170906d78200b007bc9d14a2dbmr328372ejb.770.1669339994486; Thu, 24 Nov 2022 17:33:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669339994; cv=none; d=google.com; s=arc-20160816; b=iApu/IVJrMM1hOux1jjKxq3tWjHWn4uaOB5n/s7Zuatds188ie9M194Fua2Osep1mv 60uZRgYv+gH1+1mJP79RlTs857HHvZSZ9fHw6uVcoR0lVhT4X0RfvcovlFizjdXyYujX Y8Au9XVrYYlLf8yF7Ynp+JnYjLddrlECZHY/EJ8Rpqgckc8vSD3jzUkUkDDARpsDH0Zp rK8RF92Yp2Qda4Om3E4/cloVCt2oh/KFuDmiKrp0d6rhbN5nAJ1eBbqu7Kt8csza8KBI rFcpjLUlFfcdeoQczK7YdIg/u7aOlyClzP8vQf4Va6h3BtTIr0kHt+yXLyWJangUjC5C 2w8w== 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=PxCA1qFGJb1Sp5vhsW81ozoRSS/fAC8CwaSX6yzqDJifX+Akm7RU83pY8hh0yPxnmm EE6XSUyw6UJ9aZBoWDqiXZNKgrQE8oWJIh61fQU8Ij55Mgx2KTOOxflv8G7xWkS/TXvY s/YkZ9WCVj8+sWNyrVMRNsCs7t9xbiaQMlJOCxB25RzFKgcPbkVvi0tVdyeD4LjtVXKU M1Ru1IixXf1XfBKkcbEDaudmhlFyuOdhXm6Yem3YAtfK5BBgR2CzUTlQPdlCbYaMM4BV 2GSZ0RTcCkJqVCLVuK5+D7AM/p2liFMEEMwgUrvJcufW3Jz+rIDwpoyayG95sa/GbmyM CdhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=eNBXtcOK; 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 ss25-20020a170907c01900b007763cc7093csi1731710ejc.884.2022.11.24.17.33.14; Thu, 24 Nov 2022 17:33: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=eNBXtcOK; 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 C426868BC29; Fri, 25 Nov 2022 03:31:15 +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 83C9768BB03 for ; Fri, 25 Nov 2022 03:31:03 +0200 (EET) Received: by mail-ed1-f54.google.com with SMTP id x102so4560807ede.0 for ; Thu, 24 Nov 2022 17:31: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=zzT1C9xStCn93ptLg62c7M0IXqAvZAoahmXbnBxNeOE=; b=eNBXtcOKriISRQaL38CqQYDdphG6M/IVJ1KWP1rzaSwpj1eh+QmQxWB73E8XoUwAXd pYMjUpPrtCMI2fvKtOnHnFyi/ZIuWPsTuClfVjMx8AT1TIuIYgYYQqmoJronqi5YEWQm K+f1rDfS1jmG3x3dLOLFNwNwgr6uBwW8M+qEH4P0psKaJXo5fgZHP2xUxcRQKMW2vH8a N3xBodxtSy2cPHQZnWgREV4JN+O3YdpH+52t2z4/sSfiAnPaFXWMkx92CsTSz34XhUzx l+zYlV1jpTZ+SPLxoZO51f5AXSGPIR+lC1ibIdBdukkV7akQ9+FKomNZvoBL+QrOgKRc ooBA== 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=X7UpkBVF6XP5x1NdIlRWD5pm7NFOcpJOuPc+p/MnPhAu7Nn/hvWdbF7sJLEgI06ZtK GGnANefPDdy792PiDuem3wrbN0vDgPRjzTQvnGATuls1lhBk59umeKxwTM0ffIxj0waK Nkvz6uJnTaWCIeqfRsPZUcCNF1Yal6jmGc8WUsnZVOYpjOxCI7pAzixWuwxE5qivbWgd Ao6BbmpNMYuO6X4w9xaTk88BjqKc94i8LhMK2GPNnVm8Ifp/3HB3oPOOaSlONjmWC6dh BG0e7eFnR5OsMMF5ZvjLxINPU8xrTbEbGfxiuZMlXO/Hf07602/cDHe5jXqSGx0ptSXz tViQ== X-Gm-Message-State: ANoB5pm8twkms9oAFlb+Ax2TFagdqSjtjUtohmxv7t802n5LHUruVOOw t818LGWAwBVoJ6GmuvdAQfueiZ06yC8= X-Received: by 2002:aa7:c145:0:b0:469:400a:3f8e with SMTP id r5-20020aa7c145000000b00469400a3f8emr19147427edp.108.1669339863247; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:02 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:30 +0100 Message-Id: <20221125013046.40904-16-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: EajFTB/MmNDd --- 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 Fri Nov 25 01:30: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: 39424 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949300pzb; Thu, 24 Nov 2022 17:33:22 -0800 (PST) X-Google-Smtp-Source: AA0mqf7BMNIJOV+7i3JxaMmWj/xW7jQNmzI74JFde/7SvIdpRejpK0QFzm7JTvSAtRtbgFMlTvzK X-Received: by 2002:a17:906:f8a:b0:7ad:9f03:aa1f with SMTP id q10-20020a1709060f8a00b007ad9f03aa1fmr30181915ejj.632.1669340002431; Thu, 24 Nov 2022 17:33:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340002; cv=none; d=google.com; s=arc-20160816; b=cts/tmBJDesv8es9OkjQJPIDFeQRx7jc43dWdWkNhMhPMordhkcenppKzkqQ1/YPR0 aHVvRSBTwfaBGeEPoHC4rQHvyMRTtvX0PHKw/JobWrsARkmYdMgPInp0632zL2+30v3Q EaI3hz28IWBLxoMsqIViVH6c1AZvvjr509F9SpC4Ih1fA3rl+JkCwKf5cNWEogMFCiOT z5Kh9SGNtEzBFlPcu6S3iC3PWzuxyEJ/Wfzosve/syYpC/bx6Jw0y5WNUjgF4zIpolps zZlvMfFV8G7mnC4QjW3QMrJv3O70BcGzC3JUIIacYYyTuQ44ccDm4i9kVGoCzMWkUw4i BbCA== 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=IujVMgu4In6dnlISM1sMwV9WORfrPTZjXtCEfyk6mGhNrFXLwNzWDB6HWy3oJSQwMN uy4lJny7NGdXxnuGSvEjDVdydAYrZUw8l8TQu4LKXyvKJuzH1jxl6dDhKLS9mOIeECZq BdJFSJ9dF0l6VL28v8z6Op4hxJX3/RaEHorn4yqefg6QEbBvZlLxfF6+Ufn+ZMgiTaRx kS43Bi0lsnYhQiEOz8Fvi21ccDXpd7v1SN+B6BkJ1S6GWP9r3pKgtFujRX6L3Jk8afuT PYTldm6b06b/92yf9wQt7UAHgdwUn6yfRTtuPe0inVR3T6bQ/+1u3EVydfVuzpmi3U3s /P6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=o8m+xOkl; 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 z10-20020a50eb4a000000b004676b9092e0si2043159edp.408.2022.11.24.17.33.21; Thu, 24 Nov 2022 17:33: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=o8m+xOkl; 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 E1CC168BC2D; Fri, 25 Nov 2022 03:31:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF28868BB78 for ; Fri, 25 Nov 2022 03:31:04 +0200 (EET) Received: by mail-ed1-f44.google.com with SMTP id l11so4510132edb.4 for ; Thu, 24 Nov 2022 17:31: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=9vKV3+HvVl/SXzb249JoWcf5XE3eJrfVPLNFa5fLbHk=; b=o8m+xOklf9reoe/CR//5OencuN05ieWUZs696rQoevs0cYGJ+iTFUwFUs+6mc25HJV OMCSFFaRN0MonIFuwudaOBSA3ajRNsm31x3s+NnMoxko0trQETtpnGlSlYNk8kHHkctk w4ndtY/3UygKXZIkb6YcURT1+PRLueNPSfSLEYrbVW0ZkGGssV1QhGIig4CW1fsfTV2c M7I0H99vCbVmskaJfqA+t9WvNouGURI+Z3lwg3NGJRypQUOUkEpAT5zhJ6VZOA58XTMQ rOYKcJn5zl2V8mvdspcoZcC0CfoGpfZFvqW9U+G0cPR2yQ+XoeHqvDgbgnL1LmAbOCsr fzMA== 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=SJcadGvJZWIYu0gBLxBLwbmOoc+b+x/+D3cvjctfAylVEHiQcRA0ycZT71bobHCwPe bxp7A03q8uoax3Y3jGcL16SiCbq46RTpcMsOA3G/uLUjZdUTvvLQ7jOPp1cZ4N3Mtb63 RhiVsUGxIrTio4zeeuEaYTmRleVZ/6WYQN5G7JSZTGETLW1HSyxULZNURP0f+yGetwue 0PonWIwi8Rj/AgJWozytSkYHDnErXI7NKJLGTHc7z8cKZbUdtO1iQBZQggyJTg+wWGDc cJlwFIiPFcKRRqPu89HiEoaGZgvYZT0e8sJa8O2Ngt68WG0IG+w4w+I/TsH7c2P+4wKM Y4AA== X-Gm-Message-State: ANoB5pkgP/Yn7lgIuw7bSN8dIwbUp+8aGGOfKQgupZrTtkTJC9MSFv0A feM1fA9c6LJ4nPhQ7/8a9+2We0T9ROI= X-Received: by 2002:a50:fd0d:0:b0:469:c73c:e29a with SMTP id i13-20020a50fd0d000000b00469c73ce29amr17806749eds.423.1669339864064; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:03 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:31 +0100 Message-Id: <20221125013046.40904-17-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: vSuF7eKRaW8F --- 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 Fri Nov 25 01:30: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: 39425 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949355pzb; Thu, 24 Nov 2022 17:33:29 -0800 (PST) X-Google-Smtp-Source: AA0mqf6luxc0A97yjfOvbFdeckUpnHr0OEU7/fNBI6q6iMhzczGtXKGXn4cfuwBAwUIC1XcbW+ct X-Received: by 2002:aa7:c78b:0:b0:467:97e4:6339 with SMTP id n11-20020aa7c78b000000b0046797e46339mr32196751eds.381.1669340009787; Thu, 24 Nov 2022 17:33:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340009; cv=none; d=google.com; s=arc-20160816; b=UQBzcHgJ5uwQqnjKvXAI8VLB9nopRxyoP2Ejss/Z35LpaTpGKxGIpgzc9TW5cVP8IM TElZeJOd0k/qEoSzVXo9qQ56KY55FmFLnhrTKOyctZEKSeOFq1VffbMnKziLh6e5soqw 9MC60/bZ8Ua6RGicXPESdOLtJn8dSVllLCOsNSBWWubamr5IygGKxPVlHdm2dtkvp3E+ KIRP0lAYNNSSH3PxaYUxTkHZHXW2gfkPLC8pgDiKcRpAdPeYoq/WMpSbcmUNJoa4b3/P YC/hbCrdbXn6+CuXs/oVavC73NQeXxUWFIUQdjCu+JVFgqM5Fq5Hl0s6tw/LKsgydTkh aTHw== 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=NFxuEzTXLxjvvF+n8+O1rnM04fyMplnv5ebkEUczb0G1qll3pWoNc7ZwS+gDoFtPLA fzs3kSGZG0J8fq29Io3NxKVPI4N3e0iPy79YIOGNg7bw4h/lNL+wT85MOc/O29hp9Klt 7hhYrNiJbJcLCduJm3s/MNcu4PNW9L6OUKYD3NhYaFO6IoTDPHWxhHfqI0hUV4UI0T7c 188O+mluQexNeRcRKFJ5nldlSyCnz9GpcwI4rBeZHnMQ66HAp6EoLPW02fd6hbOfg7kz mEdACNvpzrtt9CTyMVgae7thGkyTGwG4WJ4f2Inh2WeBD+lzqT+kmn9dzUPpB8rBNz/6 ltaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=iuZ43e6W; 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 sc2-20020a1709078a0200b0078c3197bf86si2117602ejc.533.2022.11.24.17.33.29; Thu, 24 Nov 2022 17:33:29 -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=iuZ43e6W; 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 C2B8168BC4F; Fri, 25 Nov 2022 03:31:17 +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 CB4E868BB03 for ; Fri, 25 Nov 2022 03:31:05 +0200 (EET) Received: by mail-ed1-f41.google.com with SMTP id v8so4508079edi.3 for ; Thu, 24 Nov 2022 17:31: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=itn+euwLExplmMk+QaeoQzEnn8eZwdG0yrFUBRgD2v4=; b=iuZ43e6W5Ls4tYHd3m5SX7J9yd7lJO0JbIbZ5rDJ7mqib5LTinKbIrOVBjDS2dzhE0 kA+tiUYMMToZd0icFYzluf5rQlzwtdMs01vRG+9hyOhjYFfPu0ncQ1aj4L4pqKi8qnYA xBYrBrIsSRDVNwcAPRwpxfmwHlkwN9sAYwvR+9yKg1zgVRbd1Tfs5CmeZ6ZnWl47Sn3c SHwHJi0JF1BHOH+P5ouw33tT36RpWKuLZqlvfT6sKQiy6YNBPOwOJSembvB/JZjLAgjY pwl0pcUI4IMDumZ17ariTdL8Npj+DzzQNR4s12EkSbb62U9Wxz8qVDgM9uvsBma4FNhH jJwQ== 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=0m6YrFRglKgchY0EHo/ItMNxc+GZdzz5l8jmgpc28pw8tT6yI5XGeduDs5dKXvSMiD s1+h8EeTRffjEFwXV5WZhZSDDFmEgD/4bKcEuHsXcdsFW/SMS5H45OxR4xlLgtSpNOyy T473U4mcYwnlksTP/9VVoDTQ+xhFudCpU47OWUpJT8ca7gr4MJND8XUupOASMEL+eNdy I7QHARME3V38b1hkwSwZuvbUZdozbz91DQX8NsTvUxFSQwe3o/CG5YjL2o+hfTL2eT38 xkrdfXe+7b0UcVmW05Lr6Y4JDhy3Fm/GXUTYXOLApAaPVBIdXEJMLK8LzfqusKQCBG6O xXnw== X-Gm-Message-State: ANoB5plOaQP+e1LNYxfDiAur5kw5wh9Bgj+JVJgCFXUes/87TXWh2/jp D8mVhb6oROA2GmCljHAqQWGLxd2IPwo= X-Received: by 2002:a05:6402:5007:b0:44e:baab:54e7 with SMTP id p7-20020a056402500700b0044ebaab54e7mr15873963eda.265.1669339865022; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:04 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:32 +0100 Message-Id: <20221125013046.40904-18-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: t8lwVaHB0B3i --- 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 Fri Nov 25 01:30: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: 39426 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949436pzb; Thu, 24 Nov 2022 17:33:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf42LEYv4+jnUt42xxB6P1XGMW0tcxPy/c3TvTfO6bxQkDSlwJolbLU19R2hSHGzIZyuZHXf X-Received: by 2002:a17:906:1355:b0:7ae:f439:320c with SMTP id x21-20020a170906135500b007aef439320cmr29575590ejb.452.1669340017350; Thu, 24 Nov 2022 17:33:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340017; cv=none; d=google.com; s=arc-20160816; b=r444WunNRv3fK200Jn5oJZATac6nKKVbTD5jlzTElouIDWzU8rwSJzBfMbKFVXH/LQ 081E9AK+SJQFUcz0y9QyfmS46YduwcIcMq4TTg+Py0lrJEaueZtJ6v64ezKsRHKslrMv EORtmeVZd6oYgLwWuaxu8lH5jogIcytkIHU4t8AQvJCZk36qhrG4iS5WtSY3kqANW1vD xIZIyKAfBrewsEHM1TBl/a6+SlSYEszcMi09rcNeeRyMBfDnQJBZy6k7Tef4FJ2v0KAl 884wJnEm1+CsGugMMtWGxrVa9f+NlseIGGMwvnOChNukoX9HxQ3dJlUX3OunFEFmb7rK Dalg== 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=jKIkWOhvU/2JknxphOu4JsnrU8WUDlYYEHRteUmTIizsNosJrjRfMv4iF1Ek8cKvar K5v2qc6JZIQlxSgNWCj11RjXS5/JFnJlPNUaJ/OmSRr/aj3dyqaR8mQ4ME0WnbEXiww9 ThfHC5tl2UML3zEYrQh4u3PRjSq99b02Uh6YINAg4awIuy1rdCLDS9dX5VsCgbY4TwXu reSkqC4g9fgfWCmlfkdJYeN4fISurVFoIw1AlaeExz388MLRGbhyEori+Zs0zLrLPswM C0z0lbtVH8BsQpr4SaJYURUgY9YsVZQkNXTl9Tbat/E/4Bt3S8SVOibFalDcGxTeBl9+ WiaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=EcWD+i9m; 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 k26-20020a05640212da00b00469c41d538bsi2005814edx.180.2022.11.24.17.33.37; Thu, 24 Nov 2022 17:33:37 -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=EcWD+i9m; 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 B97A868BBC6; Fri, 25 Nov 2022 03:31:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2657768BB84 for ; Fri, 25 Nov 2022 03:31:06 +0200 (EET) Received: by mail-ed1-f46.google.com with SMTP id z63so4515009ede.1 for ; Thu, 24 Nov 2022 17:31:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NJufz4NJaHmMwJDZEV1aFBRizUd/ZI9ltOt8Syw4F24=; b=EcWD+i9mfG/iVgpouPX5DP/heETnMScanBawJDWZoAsAj/uuxMPOval5eKLSWHNQt3 dgd7hh6AUyyrAVHpWEisv6LfvT34yYD1sFHyPki11UUp6IbNlGxQqX5H4MAeDLKu2evR 9hyrXHz3WJ4COPmcU9fKqCKbSecmaxex5jbZgpsykkBYjeYKX/u2cGvL1IXQ2almUxFT CMjQwPr9bgF28aMVxT0bU3bCBEkaGKtcyi3O2KYpZx/+fAcfrhLITZt9waiUCWy8yniR MZ5Ozb00z43PN/ite+Ss2Bk1XLHlBM0G7pVAOdntlVhpuIhLASN+CndMd50HhKU8y90a ch+w== 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=Y+xej1mCcSLmw0So4ufM9G7pIOL3hOQ+17/eBQnyvE/b1WT2ofGXK6JRggpXquChAE KOM4rR8FVyxC+kh1I4DcehZ627i+BQoL/qYnlFoeBOHMcCVkALKHhn3kiN5wOfwOnTsE R71tUBGCX721yuXovEUPLdUVYVEYLlIwooGIZXVgHYdMvYbE3udOoLvBuheCUaUWv8Ln dcUwT2V9ra5gtmpo6VNGrvZkar2Ho9FEXszPgd2UHVFncHh/6+IVsTFNIoecpoV6YZle MOEeOUrrelsbFjBaj5ICspkwdkLG73ws4Rs9uixfVZiFs+KJOPvpW5W6/8UjRdOASiM3 BLIA== X-Gm-Message-State: ANoB5pm4KDJQuPp83II+IRwZR7pNE40fIHonTT5A30T99J63VrFn/Q8z LJ5GbAFGGDeE1E3iC9VxH5di9ZmdT6I= X-Received: by 2002:a05:6402:2949:b0:468:fb6b:3a79 with SMTP id ed9-20020a056402294900b00468fb6b3a79mr30996700edb.63.1669339865823; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:05 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:33 +0100 Message-Id: <20221125013046.40904-19-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: xAKgG7YHgPEH --- 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 Fri Nov 25 01:30:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39427 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949509pzb; Thu, 24 Nov 2022 17:33:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf5NH4j+xl+7OByNrdriqjzoaXyB+LZzF7N59ukFLEIfU9rLuj/YyDE2IPRBSpRrVKsj7PDc X-Received: by 2002:a05:6402:142:b0:461:7fe6:9ea7 with SMTP id s2-20020a056402014200b004617fe69ea7mr32118734edu.94.1669340025195; Thu, 24 Nov 2022 17:33:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340025; cv=none; d=google.com; s=arc-20160816; b=oEvU/WDyRfVX5MH5mzonLcQsffNzLwGjYIwVSbe96YWQbcBEVkGpNowqfKx4wwvim4 rF5XXTqP1ghIWzDMGCOBtWQQV8MTYpzb1wJX/7WpLN3EJS8E1bVlwVKjYV/rCpbB7TjV SSl3Hr2PfNEcFH2ER0iRy7uyDnY940B0TP2gzs1fhscaUsBpwmkI6czQpO4dLQRjPlHE sPCAn02wrrxxj45Oa6bGsODybZcUNnjqSNljDerQ1cOKheO6YMq1rbKEHGUo5BRIleEs vjWkE49qqiHdsg5pCAIJS3vujaLdufgnEsWNjPWRlwdy/wR2tPs6c2Z0coy61PyHfUhu 175g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=T+7LZoicsXI8J0izCb1NEcZ0xiWFPyLBN7nUkk0ThEc=; b=g1l1kUCmvyIC7qQxlUGpzFQTEOQSBimLi6s6I4c0fhoNxc0oEMRvEfpjSNR4JpjwX4 28GHKNzF/i2xN6qcS9WwEmdGdzCAl/Ubud7i91HS1WPCjNmaOetTkKwVn4RTlGMiHsnM c5NKGclVACYItT0ZbGpqTw5Fq9PoutwaXXBvlEaXI4410LIZpXr9aTQpRhOa3zM9GCa7 1C6w36pAw2S9g0/khFRKFa1Yj8aZ3Fds6W7S1Z7NLD6/6hNs57lviKBtk5nARKllCWTK 584KtrcYMijRDKweq22fGmaYffojqLERoKmCXgRlAsR6YBX9uf6qW7NghubOU+RQy8oF fgNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=b+TK7BGi; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id di12-20020a170906730c00b007b5ce4a436csi1919971ejc.227.2022.11.24.17.33.44; Thu, 24 Nov 2022 17:33:45 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=b+TK7BGi; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1ED9068BBB1; Fri, 25 Nov 2022 03:31:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07ED768BB90 for ; Fri, 25 Nov 2022 03:31:06 +0200 (EET) Received: by mail-ej1-f46.google.com with SMTP id ho10so7290515ejc.1 for ; Thu, 24 Nov 2022 17:31:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bMoadp+AOwbOb60Vya9/jgvE5sVNRu1TX8uDqFbHqLY=; b=b+TK7BGim6ho68YTMI0uUQMV1XZ07J6v7Pzhe+PVf0lOGIieIrIMKwb1Ep8rGv0uao GLGHydC12TgtxWvetB8jNeiT++dZQwoe7vWFgMkJG9Y0jUcxS+XDiL4qUnVnAOoNT164 k6oOM7ReVpQABKDiRhTw8XDkSebnbZzVkTUCLEGwDlaWIiH+60z5kV7wE37r4x2lQCEk /1sR+ozjCwukkbUgdXIV43Bx5ltfZOxsf7yi1866y6fxlc63+FboA+F4tkXSusZ9s27Q KTslOFCr1VIVKq0hC6LGwjBxO4C+k9jNR/Yv8qE8IYDEXOZ/XulfTQWcZ4Unnb6IfW7S ziEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bMoadp+AOwbOb60Vya9/jgvE5sVNRu1TX8uDqFbHqLY=; b=UP47j4vpSOXMzSy2ATCRpPvCo/VgMoUQpsY/8UGDCrBePgBUJ9EwUqcRWOP/6NIScz DE5Wssdn8ftNkI0vATpJDwdRlkE4fJUj1eLsqV7vcduP5oK3FgS1y5zHlWrKNtKII5oZ DfF+N1Qd6ZdK0AFHr1VuU4da23W3p6tCS1mScqliDohR6tcxmCG2ZSXpwBPj7g8bHUbQ Y8oItrm/JxcXRjIk9BS46zK4CiOMioDtdMPi0zL8ell1KSlJ9wwDboxaLP6IhusIcjSo UDYwr/6RWFWEpp1vITNzwbzKl0NxALvehi0jOBGIH6oFCZ/dUa/p8KyEMOS2yOujIPRX FGNA== X-Gm-Message-State: ANoB5pmdTTQapFTxoJd5dZdobvr8B0geB2/DBmfXr9nihgFbTK8N3TKZ +S9u1sPs+HwhVTqy49vmjbZNhhLGCbw= X-Received: by 2002:a17:907:7650:b0:781:e568:294f with SMTP id kj16-20020a170907765000b00781e568294fmr15867863ejc.447.1669339866701; Thu, 24 Nov 2022 17:31:06 -0800 (PST) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:06 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:34 +0100 Message-Id: <20221125013046.40904-20-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 19/31] avformat/flvenc: use av_dict_iterate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5+CghWaZZ1iV --- libavformat/flvenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 59be11eba8..128ae8ebc0 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -277,7 +277,7 @@ static void write_metadata(AVFormatContext *s, unsigned int ts) int write_duration_filesize = !(flv->flags & FLV_NO_DURATION_FILESIZE); int metadata_count = 0; int64_t metadata_count_pos; - AVDictionaryEntry *tag = NULL; + const AVDictionaryEntry *tag = NULL; /* write meta_tag */ avio_w8(pb, FLV_TAG_TYPE_META); // tag type META @@ -353,7 +353,7 @@ static void write_metadata(AVFormatContext *s, unsigned int ts) } ff_standardize_creation_time(s); - while ((tag = av_dict_get(s->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) { + while ((tag = av_dict_iterate(s->metadata, tag))) { if( !strcmp(tag->key, "width") ||!strcmp(tag->key, "height") ||!strcmp(tag->key, "videodatarate") From patchwork Fri Nov 25 01:30: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: 39428 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949549pzb; Thu, 24 Nov 2022 17:33:53 -0800 (PST) X-Google-Smtp-Source: AA0mqf7P9TIuBsDPiJC6tckrjHbpJtdFEAlQYcaiXj/YfXmBGg9xZJOAcwrBBRh4W64Q5iCX5als X-Received: by 2002:a05:6402:3895:b0:468:15f1:54b5 with SMTP id fd21-20020a056402389500b0046815f154b5mr14294928edb.8.1669340033033; Thu, 24 Nov 2022 17:33:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340033; cv=none; d=google.com; s=arc-20160816; b=UJkeOd9ICgjkB+5P38kEffobGrb6RU8vm7zHa+Luy3JXkHQZBzeCnlxifpniDEbhwW /kkeyf5MKP70JCAkcO5NZ+LbzXwdTW91oszSKXa9izHGPMwwvb1onxKQ+xWJfFjDphWT zo12lz7mkipbDdEBSp7hTEB/IuBOylUAMBDvfhis8rMAlsPRqa6toDJHvDkeXfe0Yrx8 VLnaLhON9lJr4mWKXqZd1/1DyXMhlMXv1gXj6pjGsvK+uS5jk4vg2Y6GDDYKekIb8+o/ PVTFzMUkMabrnINBzk4BTipsdvQuGRZ6p0v3JBDyJAtcWG37txBwO93H6Zam2iWKpIkI 17Yw== 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=I1/WSgqsUhHAuFPYbm0yStwaaNO91F/+QALa5JJ0BsfhqsJ0Rte1aPxVVpjlGpHZdM PqySGLBOA7FOkAeeI6sK0TPrDcz8slJQU24qzRf0iG9GeFwYRhmhMCbTX0y7fui3Aks5 4A1tCqH/PUhBJIV2vj15EAQoAd8NrX9JKnc6xYTCnHAHcurD54ofzltKXjickZv2j7sL /Ui+54dHc04RbrKYgniH3Ha+ljBG0mIqNHOhqWVO1LF8WM4BKDfF2ZVnKYW7ciimF19Q 6tpYd02OnNjEjxwa8+131MMAwHCwMtf4S7kFEI88e1LCYsoVaiNej4gZobWMlTVdaD4/ uM2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Q+9JosW0; 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 bk9-20020a170906b0c900b00770872942d8si1514482ejb.958.2022.11.24.17.33.52; Thu, 24 Nov 2022 17:33:53 -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=Q+9JosW0; 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 4422B68BBCB; Fri, 25 Nov 2022 03:31:22 +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 5C39E68BAEE for ; Fri, 25 Nov 2022 03:31:08 +0200 (EET) Received: by mail-ej1-f52.google.com with SMTP id e27so7192371ejc.12 for ; Thu, 24 Nov 2022 17:31: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=fUNUi65vhjY3XsjjiMDMEIss5wk4XG/e60tkD6AkBfk=; b=Q+9JosW0jMeNK8VglIKzXWNtaP5Wfdmrt6HQHmmOxrhC85ckuchOSsKr2n5USWUl2s Xj8T3cofkCZoN2zdjRTSruUgmqHPapCqJAorxXMby8CUbE9zKkoi+vSFnvRGqvarPNPo Q5AzXvW1j3ZunaZh8D8NDmC7kfWN6OjhzSZpvXgac1CY/hlnH6HwcKGs5n/TeCSfW37H pt4b9XVU5XfQaRF6cmi4qywlxHgF9rUMCZDLS62/pv1b3wpDaPCH2YljBX37pETHZD+9 yWGytaa5LS+YlVFb5tcGVzSwj2jcQhZSP5FissUe2EjRmqoBcaaeXcyoxl/5BC0VacZ8 qTzA== 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=dVOHsT9J2gMZFfpG9XliR5qjqAuntrUhN8AunhdjWlKBXdMuXZNYy8puBMK3IgKs1T sKKCipgMtP8oMRuZ2q45SNhk3u+oqhdV9mw0gQDVuaASUqZbz0yDVzQA3U0nyas2B7eI 6MQbpO6Gnjqjv0nzcC5uYRCDoRzSR6rOidRXrTREykBQT8GE8TEyWuR+dkfRFRPBAqdL GlUO4OIPAa/2VU8iIxlkaSnsasnJ7yZBlt/1kjXYF4LGpUAu4yceATEy6tRfC5vj1RmD qmEQSdwbMCeGdk1H5kl8c0wHNX5/XkpsWE4ZnBySj3rgQudXNTOVE1DdVyH9TbAn2ara Ri4w== X-Gm-Message-State: ANoB5pnlNlxHHT/3TllPWVVZwqBDAoyqzwVWPl2fIfM9YvECXNFhBHq+ H7uTdIJjE4Dl5yqYKj15nE+Xs5O36VU= X-Received: by 2002:a17:906:dcc:b0:7ad:69eb:90c3 with SMTP id p12-20020a1709060dcc00b007ad69eb90c3mr30656364eji.285.1669339867550; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:07 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:35 +0100 Message-Id: <20221125013046.40904-21-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: MWG/W5DpmwsW 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 Fri Nov 25 01:30: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: 39429 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949622pzb; Thu, 24 Nov 2022 17:34:01 -0800 (PST) X-Google-Smtp-Source: AA0mqf6Tu0B4YAYvj+l8HN9w35AURHtHAyHhF0EkC99O1fBf52Tw4B/bbEjAC0kmhPrIAP5WeziF X-Received: by 2002:a17:906:22d1:b0:78d:6429:a806 with SMTP id q17-20020a17090622d100b0078d6429a806mr29803485eja.553.1669340041151; Thu, 24 Nov 2022 17:34:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340041; cv=none; d=google.com; s=arc-20160816; b=ea0bLxedSyGLzb2TpRKjzaMI1paQYC3otUuTDuxFeYpEPV86Whcv4yczxcUproiz9D v3m0bRISEE661WMpXQ9Tp2Mp51fKBcKarHxZ54OkCtNdeeduWq/hS/rXZlqcYyjk0yvX GlTegDBoIU45um2NgPBmXZPkDpp1t+8DOd5vYfYfUJ5w1GikHbwZwWV7WpLWNymt9Zby r8E+/IAdZqkKtyFLLby8pmucWmYNB9Lsl5Y19mtGfjoEtjSp3KXAqtNKliXO9GHqYOyt TgZZqBsnrLcvIRHjkpwOJlnnPRlHUu8wLGsaqm3hB5hlbLd0b+UsdQrkZ7vDZSN3vmfv ngDQ== 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=YY6HwsGuya3y16qyTjc9O4fbb/fbGkPQZ9o6DJoTGz4uiXKzMZM4VmZhsKGF9JVgRQ 7BXBm6JMpwaQXnGlDs9P/sCDYZV+bnOL/eSlNBbL8h+ALpce6+nObFT5OoqDLExNOqza NmE/fYEMtidEMOtgTGlUnsC+tNbJ0XgbTrBMrWIu20Zc4cc0AHO3v7NpHhZeoF25OxFA bEPrwp0cDsqjz91SO5H0t+CNQa0815scsvaVexGypKC/7LNa+JywTw4foVTYuyt6KJi6 s5C5ujrnbAlIY5Tokm4BPMEzAqV7c1JJiJC+qHFt16AyhR7DKXmRAgvpoGePy34G2eTJ NJLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=i8pVezBW; 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 hd38-20020a17090796a600b00780636887fesi2296732ejc.797.2022.11.24.17.34.00; Thu, 24 Nov 2022 17:34: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=i8pVezBW; 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 5216368BC6A; Fri, 25 Nov 2022 03:31:23 +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 2A40068BBD3 for ; Fri, 25 Nov 2022 03:31:08 +0200 (EET) Received: by mail-ed1-f52.google.com with SMTP id z20so4467837edc.13 for ; Thu, 24 Nov 2022 17:31: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=JS8mTXhWnFdcu9CLSlxzuCNSAEWmh5OLpInzpyBMpk8=; b=i8pVezBWIMuh8LlnGMTze5oYAvq0ur6YGFue8ufv8wwBLcC3fJ4Pc5gj+nPFXyDIXU gpSZ/9xdAJ4cIfpcza2hpAa4FY5NbfDZ8oPt5fbsZO+mOVBgQZPISi4szg7zjB5I3zKb pms5vXOA7f1Z/ZMVgvtfxUXRH5f2tazdcPv+RD5swOZiu6eaWOvrfi0h2euLTSNKEP4U uS5GHgidHoNdVz36KX6SV0kiPn/9NoT+UXYksJDRpfNEPsU8mOYV6e89j1GSgutmBCD2 LXI6dkkRxX+x0CSzi0ooy6/dL4oBpKOFZSjc78whKgs2Vc3n1TVtH/Om8JlvVLWcmlhT U5mw== 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=dMg032SVIUOqWREaAGFCSGn6OViB9Tja/TUSO+gnnTnVmerySq7w1IRM/E3FS31apV nHq1MsQgZ0qMaEojpvU8IeCwFGAHllIzfHlESV7KSie/duW9kmX8m/EJed20zkuGDMo+ 9Pso3ieoW28mgTCoeMekb/WdElZYO3sJkmjlPPg8ioND/9Wf6Pktq+LUxKU18OcxSLKt Q7SyAiqE73VVlOt5Rgh6qlTwSrFz0i4X1Un/2zyTCcgtHJPpheMIl4wuYYp2/zOMCkZb ngspmWb6vTJEw3z+D6WpB2ihuR8pPMEJ0qCzI6mJKUlHfjgaY7rvVIVfgg9PPQ186NLA U9qg== X-Gm-Message-State: ANoB5pmjO4Qb2cn7NbE9ALZd6PtCJL5RiAA+NvC7LUAXPl3/pFQ76E++ I2ZP0rzsG0ijQIvQlHfd32dpUY4nkh0= X-Received: by 2002:a05:6402:4a:b0:461:aa10:cb0c with SMTP id f10-20020a056402004a00b00461aa10cb0cmr32842054edu.383.1669339868363; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:08 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:36 +0100 Message-Id: <20221125013046.40904-22-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: +dFQ3+0AP+1K --- 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 Fri Nov 25 01:30: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: 39430 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949689pzb; Thu, 24 Nov 2022 17:34:09 -0800 (PST) X-Google-Smtp-Source: AA0mqf4PABzab3z+XOOqPfaw50s1v6XVFICSSO3dvuQ6zdKVP/X69IEOahHOeAMii7pEPy+leM17 X-Received: by 2002:a05:6402:444a:b0:459:401:c23e with SMTP id o10-20020a056402444a00b004590401c23emr17637561edb.23.1669340049351; Thu, 24 Nov 2022 17:34:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340049; cv=none; d=google.com; s=arc-20160816; b=tP36+iunDhl5Hto8sGft1fsAkUrtZ2BWKUPiA+V69T1m+EOngwvUObYycuq6MSYwLO SOn8NR/Lig6KLp+c4pk/FR2GUb9z4ZvrqFwRaksxJmPqGoPx36BdSVIKheRHoXu7jN+Y 2nO2nt9YlwXdjcEu3LqeA6U6rv+ZaXVs7IUHA0Aek4LVPN/gt/VpwCrh6M7X9GBh4J1C FAn+c+mxU+czcLM5aijOlaHAbm6skoaC6bGe44pg1Q7gL5GAn7W9bpF8Gb4u4/r+GM4l l9wfuvAODJ/6YqFzMWhnS2r58pO4QBbTKUuU+iMLVoVK8gV0SIxpm9bU85JW/naU6A6k P9pQ== 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=Q+nUK3KJRNf4m1qzoC5isRC2MNX7KM4PF/n6HBatO3yD2USj/GP/tx3Tn/3VqHUzx/ iW/fZEK08bwe7Dwz/2R9gPUJP9h/6rz8sqPdpS5Gx6SIIvU/Xz4drtxNyHSgN2X7PpPr 0Nw/6w243jtNUtrHIOlUPpiNVtFh3FpxN9KGBd222w9tkZ1TeoSGuyBowLGs5mxi/15t BOlyqyGcNJ/VSYyWk65mhtrUsh6vFQ2X/h+rKYlB1HM40EWC5WVq4ySGNaWol3b0CL5U aLEKgngDZjZjAzS37YCTPhrwn/2Yu+TQzKxByrpTY1QeMRg4jnzb7TnHco9bw27hYSbb GGcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=bxPp8jfl; 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 xc9-20020a170907074900b0079d5da30399si1970534ejb.427.2022.11.24.17.34.08; Thu, 24 Nov 2022 17:34: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=bxPp8jfl; 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 5BC1C68BC72; Fri, 25 Nov 2022 03:31:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D4CC968BBD9 for ; Fri, 25 Nov 2022 03:31:09 +0200 (EET) Received: by mail-ej1-f43.google.com with SMTP id n20so7361443ejh.0 for ; Thu, 24 Nov 2022 17:31: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=EaUBJ+VPjTUNdhAdkRSHZgEjigw++QPR0Do57qj+Hkw=; b=bxPp8jfljYCrB0Jq1OIdRwWBJdAgQro3XturtGV/VYGH96RmE7/vk2YLScIrdiDbDF W44JShTstbIjJj0XWqaPmGV/qz1h1LZ/GM7pj5DYnxB9MLtAS/QbMZmHYd9qD0pMtp/r RqoUY2j82CNJfPMBAFOsQdxp8bzAtDWHmVwk592nP/Rui2YAq5o79MgeqM5egUQH9lHe vjQKFxD8y3Cm4Ex8dshxqGzNnd+oI7E2ZlD9XFhSkRjclBsIEjX913aJLClZ2v0GT/TY gvTCGf7eHfOdqsVYrZUSRXwQBZWBKBh5MLL3swVoMagRZ0MXHsjw5HZNLEOWNMw5PztL plzQ== 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=shbWiAJ8OGR5X3/A6eP1wwg8H+eIe0lU0KGILGYPb/5ES87PUB+1/C3teA+9CRueWo xWpNsqZXRfiYonEUjzEWnfJRTruKD5LbhYnuHXTJ3N7lSbET3S3fGxgGPK7FZMO0hLZD iHukSteYg0z0yj5qA/UMWbpYE2ivqd3E/8fBXYp2QLtS0TTSr3IOfBLzehc5Swdt5sR7 SlihW26lSQwakFlgKzt2Vkfks5TxPkCfo7ahnvfdxO/Y12VKgI3LU8ZnVB89JWEudrQc fVe35Vb2H15G500zVwt4dminYPNC05lUbj/nrbnXF/Yhp1vfLUGbWVSud6drtuM6tjrd fddw== X-Gm-Message-State: ANoB5pk45QNZBniZV8taPRpHaC80Ii7QeQAiY3zuQWMf/mGiaEMKzxMQ GLidwe3uv2tZHAwIwbkFsqpr6we27Wo= X-Received: by 2002:a17:906:8a6d:b0:7ad:d18f:c2d6 with SMTP id hy13-20020a1709068a6d00b007add18fc2d6mr30484108ejc.271.1669339869324; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:08 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:37 +0100 Message-Id: <20221125013046.40904-23-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: JhJd+I4R5qmJ --- 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 Fri Nov 25 01:30: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: 39431 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949769pzb; Thu, 24 Nov 2022 17:34:17 -0800 (PST) X-Google-Smtp-Source: AA0mqf603LsmFTurWiZLA+mjZCdhDCbKKCFTVfVVY7N4mbSgAf7Jalw4v0F3GSi9m7U12FrZLJng X-Received: by 2002:a17:907:76b7:b0:7bc:aea6:e89a with SMTP id jw23-20020a17090776b700b007bcaea6e89amr167545ejc.671.1669340057571; Thu, 24 Nov 2022 17:34:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340057; cv=none; d=google.com; s=arc-20160816; b=I2rCA79W99E4nSdYD7g3/OPVCnsCvsroptmHWCSx3qEAfg10BLLBHZIZpPwkNzkSpa NJYG95XnHAFNFvdefDoS+Nfllq2MxZxZy47EZd1GxbZD+cnbJXgxgd3sMSp0SNTRuRqN h1oqaJ7tP9tEJKBSuaiCTplnVLUwwkR/3/yDxQNyRL1k8d5p8noLsQED0QUIrZcsHjEV U/+U7hST47HvpeSs/bBQdpf8SpaIf+WzGx918ljeKdcO1oc5sbW4KYmBVve2Owwl+KCi gHtUN2Mb0CM29/a2JiiwCguXCmOcmN1Tnmyj/Oa4mFTaVaqBJlf1kL3MUw7o1gnt9uih //gQ== 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=ydwl0HsgiRXVG8gsMv5oxGmDozvr2dCtKnV1mhxiwBc=; b=f3dWwfYhR3GXuOlKPWRNLJlR7o6v2ukJBceNTAkW5KhtrJNRa0rfzo+U7W+M/bnxSA s1aPyqNjDZvrq3/gKZrteBCbo0E78pcNo/YVamB1Yb8ExseKKEES8yqMAbhf3wmYnoMa j1S0i/6qFhebtQH9VGHwZqx5YEfge+BG1LWVn0f7uUH1FRHK0JY67VG5VXVz6zzCEYxr iNYJe1uwdX7ZQLDdQYwQmRAjHzp+XHH0G3NythNmET0jKrX7NlizT4NY4gAyzzAp430E 5pyDeHNTzeeVP5ik1HJ0jyOMv0obAbQEto1f80tsMEFL+NFEUfUd4mugwpWp5HcpDA8L mD2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qlNnFxqs; 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 g20-20020a1709065d1400b007b5ce4a4360si1249335ejt.151.2022.11.24.17.34.17; Thu, 24 Nov 2022 17:34:17 -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=qlNnFxqs; 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 61EBD68BC6B; Fri, 25 Nov 2022 03:31:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E775F68BBEB for ; Fri, 25 Nov 2022 03:31:10 +0200 (EET) Received: by mail-ej1-f47.google.com with SMTP id f18so7274329ejz.5 for ; Thu, 24 Nov 2022 17:31: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=LeaU/uYPobn934gI6NSNXvdbvmf+ijFeIile+pZKTSw=; b=qlNnFxqsniUUWKeYOA7Hp4LE++Fz0tpB2BednfFTsGF26jhtlvnVpTd8BId4hxdhN9 07Tf64rX0lrjzLNuSOB3ujtlsEOgH5+eltOeJyBqtfrsj3JrrCLwlZ8q2AO5gohJVMzR rmlq0QU8M6ZBRveUrftOeXLAproZ+1ELZEjd4cVmunch/idgcla+OJcQjfMDugoraKit q3GmY8Yt9zPGesFAlZdZ3VJEnNexLgYZRYGH6s3mCPm01UxrPUoNJ514NzKOX4uFU1sr vWuDTrR4GeGRtbtMN4iZ1XteUz28xCtOoz0sFhQfux3HSNCTeJ9/bxt6aOo4+GKqJcvW ePiQ== 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=LeaU/uYPobn934gI6NSNXvdbvmf+ijFeIile+pZKTSw=; b=XgFZfgB6avb43wooSi4l3iqNFzmJ5IY0XxVLv2TuQg8SJ2F3NQD1EGelToLiOn/PKE V4NG10FjgoBcw2AylahsGVh9bmqMcxIjgBF0IB5kgdWkIfMWnzsJzwvrC8OsxIp8VwWU B4EKWfVW8lvJHcU3nKt2hx0KiRGfE3bKLV4hAcvz19F9RIQqeNwaVXod1dGmdFMsVncK wGhm/YjLx6lXqmzqJcQMWUiUnUox7drARcKCGgDFUA0iOqcv/NgfBGCsECYGNl4MCrJD t9cpGTQwVgoossKqRkTS8qUR5EwZ6afFjCADI93Qj+EkA8PAZtu1T5EvUrfwRzOYoW9I UjIA== X-Gm-Message-State: ANoB5pnnPux9qrv069HwuwNyiRR6RnJxD8vSxrEo/kPXvQCfllxNvlSx AJCwBSnUJ3Q3gO2UUX67ZNgI/yLD2xc= X-Received: by 2002:a17:906:b11:b0:7ae:50c6:453a with SMTP id u17-20020a1709060b1100b007ae50c6453amr29537750ejg.596.1669339870115; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:09 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:38 +0100 Message-Id: <20221125013046.40904-24-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: kdoNgaMPeiJq --- libavformat/wtvenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c index 7e28b2082e..977e16c5a4 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 = 0; 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 = 0; 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 Fri Nov 25 01:30: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: 39432 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949822pzb; Thu, 24 Nov 2022 17:34:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf71tZ4y820RsGRFuVBi5twUQbXwgmz119MuWR+F+L2PUwz/bP3+WY2YOwOM35CpnsCn8JO8 X-Received: by 2002:a05:6402:1bc4:b0:46a:342d:dcb3 with SMTP id ch4-20020a0564021bc400b0046a342ddcb3mr9307892edb.227.1669340065765; Thu, 24 Nov 2022 17:34:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340065; cv=none; d=google.com; s=arc-20160816; b=XcuU9NsGi6RYJZwBB/eWzLlJiJyAQ9d2FQjx1jHs/rSN6d5j05Fp2GNRED4tECdmtS LQUg4aLaCINJEgZLlnLAvKSwr9nr+QfPO1V8smiTwoVO3OsjQ8fAJICJ2JFO3N8VF7bj 4IYTkC/Sere9X6FhKQcmveRBsWjqFvr7HHvnWTcn/svN1BPxD0aq1HyGEBukz7MxX1n7 UxMNbEVUyVICX2ScPEJl8r7tutv3ZlE56Ya3Gb5JLsLU7zsots/A7zatXQssW3/9rCKG AAP8c+n8fOTpfQ1IKUC9fitUo5rZrDp8ua8vvcGFmE5Fh7rXgwCjRdBr+QgFkObZfdCY k4xg== 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=UuMwi8WBufhzobINBdla044CivbugyBdd4xrhPgIEZd/lTPhvTb//Mr5eu/+8mboA5 4y+OdwIJCQamY5AXJp52RZnyKWMOGBWTvQZYHfyrWsXM3sK1lEtKzXUJEX5Fl5Pk9goe iNSQ5pBBJmoyu1I4GgCGBThUx7VfcrZEUjueZYLsQj8d3m+TntM3uHC6bDYfx92mIvtW A4NQYvI7Im8AliLg404NJ9/xVOBHFIMmX+V0VDYafwZ0xqL1HI1eeFXaX1Xo8avAhw7p LHZzOjRH7dA1NFmqocqypvNpuTSKt6kEqZyARipwSRG8sy0+jkmGkB81aChPS7r9e8y1 DApA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=oyEVzibd; 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 i5-20020a1709064fc500b0078d148daf4bsi2329481ejw.409.2022.11.24.17.34.25; Thu, 24 Nov 2022 17:34: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=oyEVzibd; 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 649A268BBD5; Fri, 25 Nov 2022 03:31:26 +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 330B768BBEB for ; Fri, 25 Nov 2022 03:31:11 +0200 (EET) Received: by mail-ed1-f54.google.com with SMTP id x102so4561089ede.0 for ; Thu, 24 Nov 2022 17:31: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=zWaR2XLWV2LYN4aLS4o9Z0WXnBSoWGGlLmoDs8EWEzA=; b=oyEVzibdPEurD5yCQ6SqiuLUkZNJ+scz7SFhfcFRXOq1juWPmRm3KM72t52V0AulEs 8ck7cz3TNiUqUSmhK37+I9IP3uNqfGkl+HnsMZ305ZM9MuwMPQBl35Kg1MhV6CT1/n+r XSHOWG46K+wtohtt1af+HPutC90+J5YHJ9AU2N8S2++GLg7VIK84nGXOPSm+QntmglGn 89fbGT/6KKZQeDekrsjHuGWg430PwfEhlrKIxwISMI/Ff9mW1UASbFzNs2uTlVlx+OG6 nMBQ2I6uLGUllZza88Y7JkusOCRyd+Bf7IxBk7CYSIZKgTbj9xAy3eEVGC203w36XKOz cHEQ== 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=NGBHKcYkDpNC0Ijh9e3xZqpzcR4OB7Em1FTLb4NCr1yajnk+6vJTCgRTkBcN5lKfj3 n1a2iPLinsYrTnHXYC1deTglCPIQHtx9GcYd9QarnVlVziGOCpElSVDCt6fBk9CnR8bJ NN5hI1vLe9nrwC2wg4jG9qzjKgF17ZpziQN5VawGbOmGIQ/N92mRiamj5pJyoZk8PFR+ ZIHsDjqfRDfIN2QJjfGWujeJ77F7B3gDHlFWcM1bGuFvWXut2vyqQ5Q+38fJx48NSefV G/ns5MZJcqriOHwDdgFTlHSKXuX0DG3T+KY99fTEs7UeGvzbtoGmQH9xoC+N55Q4zRnI E7Ew== X-Gm-Message-State: ANoB5pmK5ZRiscVSgUwl4ZN96ar5k2GpARubNX8wDgyAk8Dru90LlDFr HP+H1iZacQqeHDlzX9XxqMyR9kVh9KI= X-Received: by 2002:aa7:d14f:0:b0:462:73ba:b73d with SMTP id r15-20020aa7d14f000000b0046273bab73dmr33013837edo.225.1669339870895; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:10 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:39 +0100 Message-Id: <20221125013046.40904-25-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: LTKSk36FQKYI --- 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 Fri Nov 25 01:30: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: 39433 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949870pzb; Thu, 24 Nov 2022 17:34:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf5nmVX7pZ5Z1tz6bGNfRxMrZmpgjQd8KiCkptE6VLZbK/UbR2mXgn7naqxfLW30CT679HV1 X-Received: by 2002:a05:6402:1717:b0:461:8fbf:f607 with SMTP id y23-20020a056402171700b004618fbff607mr31945290edu.235.1669340073471; Thu, 24 Nov 2022 17:34:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340073; cv=none; d=google.com; s=arc-20160816; b=tEVzRZnBggE6tIo6WWU4Fn8DH4rA7gqwvQpKgrAUtzd7Q2tbIJrbuGSFWrTXTBsXgj hQt57Z7VRnoJZnEazQp1DkUXaPgVW86cmLDQwOk3u7NOsycbAQwssokGJm8k937E/3FL 06G3N7Mmpb4s/v8sjQVNWCetuNQEjQVK+/J3byRcrYc/4gIz3Hzvriy2zo3Rp+thLtZ4 N+UwjFoNIqGFqwdtDtDg2MSoMnnyeoO4ybqfdO4bbiQlNStv5+cZINdOIBlG04jtEWQ1 zXg7zpoMS+2dUY31fz2OCnvQatxnWy9aLkeFP6PicUN+eZNDHYL/oF31y/98v+fobXwq t9dQ== 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=TCanc2Ai4r5Om6zUKAC35A1g/7lw6I616oi0H8QqH3ehQtAZRecpVXbuORVLuO9pet PGX5ZJHaQokir/2lMv6L2XjvtpGR18uxdsNX1JaVxuva1lcoHNZczZAJiuDTcafI3ACp Pzw6CBTxUi+9H8CaCUezJvOaUl6q74yrqpDh+9XxbeDb24fg+59fEI/CWWH22v/5sBsI Zkpd+6f/nL7nj+4T1fk7Cc0tzvCsTJMkD0SuLLDBsJQXhzBDW2E/fYFPzVIhks61/emb ZLzbsyrPh+1IW287e9CRbbiB0DeIaG9SX6QiZl9ap71KfOEwogoiwp4PacjUtDrbaUcj /Ozw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=J0k9RFYK; 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 hg2-20020a1709072cc200b00780837381d8si2120233ejc.591.2022.11.24.17.34.33; Thu, 24 Nov 2022 17:34: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=J0k9RFYK; 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 458F668BC91; Fri, 25 Nov 2022 03:31:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0861068BB3A for ; Fri, 25 Nov 2022 03:31:11 +0200 (EET) Received: by mail-ej1-f47.google.com with SMTP id f18so7274391ejz.5 for ; Thu, 24 Nov 2022 17:31: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=usF8IYSm4A8E4G8ZBIFm+bYtC1XpOWWOV+xjiBQExXg=; b=J0k9RFYKgvCUKvNX8n6/zI0IOHwDXnmysbxOEtWmSvD59EocdKx46JbIYYX28oxF6a Qujga45GqLecW6zrMBX9EZIMPbt5PoVuQq7I3hXP6b+fiv7J8JwNLpSYgBWv/jKX3D34 0QiL53o7i35+64I+snPnFBnzxU09IK8Wjik8P5Hv0PmdDe8lYQnOdIlCeBkxwPo/UFUm HhpSvptPIT+gqgy3JMwXntAyjAKDDXxTXhXG4ULVUraJIhCd7oTz2/8Y6g6SWe8H+qLm U3mYr0GUa67xak0JmnyEqvN8jfHIoQaUn/gcHusRH0sMOf7xMBoaF/px2pAiiQTUhpVI yo1Q== 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=Cut2++TN4DG0mhzaHUOWA6R+c7XcG2mIn9I1/FuQSwm5DJfAY/WCyWn6n1e2yQ6p04 fe42MBh5o+7ooIAOfqn53sEYiIlmbDqJnEhyjOti4swTqekBuvL0UXSNUq7i2z0O7uPT GdKw234ZFoP4Owp/5mG99xv4LRQ4gGIOs04zA1HeV3XmaCZLda1rctw/okfx8k9hAZrD Tt672ojhmsbJGY9Ic/bl9cBkWvhuv/2Apc7ETgiUjrvGJf2Zn90jCDnN+/LbDV/leJ5W o87XMW2YKv/WrGeydP+u2q9VN0ixp0O3/n4HmcpZJib3nH006/KMkuPrac3rLOSvM/F+ 3OCw== X-Gm-Message-State: ANoB5pnhIoaGeREr5qMuW46grzch0BlJWviqDoWdP0eNhmJcb4xSsMc6 h0Jl2FnzuvwpQDzJ2764sd0R/jCx8ko= X-Received: by 2002:a17:906:cb90:b0:772:e95f:cdce with SMTP id mf16-20020a170906cb9000b00772e95fcdcemr30204808ejb.78.1669339871755; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:11 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:40 +0100 Message-Id: <20221125013046.40904-26-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: 0D9uzZ+2XS62 --- 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 Fri Nov 25 01:30:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 39434 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949926pzb; Thu, 24 Nov 2022 17:34:41 -0800 (PST) X-Google-Smtp-Source: AA0mqf5I/ZvDF9nwloUh+FPx8HNUtbmtySB0JEFuaLUaIa/SM7eqlmF/3L89jDeV/tTOSlqqTvfZ X-Received: by 2002:a50:fc11:0:b0:45a:1bfa:98bf with SMTP id i17-20020a50fc11000000b0045a1bfa98bfmr32463414edr.413.1669340081086; Thu, 24 Nov 2022 17:34:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340081; cv=none; d=google.com; s=arc-20160816; b=zeKCy6OxDRJNkc3wQ7r5x2MnSqkgH/Zsg2Gk40j9METG5u+qGTmC7vcpLPVnV0fcKN HixfgR73I2KX9hzzVQp02Cwx/Q2D9reVtgYQp41Es+VozpXu3lOdOk/MVlkN4wLXxXD1 OLG55iHCuYy0x8jEA4pYMMgHLWom+NBATj5wIAe0d4Lmx8DZ+FTgEklhpN67Ew/DnzKC 2oZKjMkYa6tsxAFw7AVRvAsiI1WXqHHDF0dvdZijnnY5YtmOwknOrYpVOe+jOxeavN3S g1T2VtiKg2x1HQPCYSHQMtmH15lJwZBkcG2T6he1wQQ/xIyfKSVoH8UyqdpclGLpPQqA MRvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=4D+7W5w7BU/Z0evSVZ3I6qZJGuL0zAZ86cX4hlu3MdI=; b=qRohfGREOVBgDZyBNB5hmz+woHmuBlaZLPVIA9gEKTqUmqlQBSE2vlwffIjz9oNcle GebCcwLMLvqjltpilQYkZsdrkkQ339y2CSIwzDO6ZZUX3Y6KtmwZfRcMXh2hYt6G3M9s BgL13mRYQ5QlYZU6Hg1qGCwbMJVsWFxDpfNbYLs9nmil38Jrf4yiBDZRgjNc3jdc+jWW dluyWuMvoRdlJqhlSd5L5V+CGlyot5JnfYHA6n507jpbv4ON+9T6HSuDqaoWOXOBkblt GMJzTaNOBfTxAV/VF7WD2Kpo5arXjNXT3NhAzyDK9leXFzVhXka5SEVe94NZE8D4iyN0 yoJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="eNFw561/"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dp22-20020a170906c15600b007bc30c06aa2si1104004ejc.902.2022.11.24.17.34.40; Thu, 24 Nov 2022 17:34:41 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="eNFw561/"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5585B68BCA0; Fri, 25 Nov 2022 03:31:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F44368BC14 for ; Fri, 25 Nov 2022 03:31:13 +0200 (EET) Received: by mail-ed1-f51.google.com with SMTP id b8so4471276edf.11 for ; Thu, 24 Nov 2022 17:31:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dv7denKsRZZl7kriNX/Y4EePok5pV+nCCZwsOMM8mLw=; b=eNFw561/y2WTdcFZx88pxAomNQGoD7zvw5ILlzlyaDE79qzFHaXWLya1wW447HIxJb IfTZ1ZZgdRqw6IhNtpM5qNmhurbMWo93Zvq3h7Y5tuj8Bdv7rzU87E+TU9/B9TzLhsEk +bkaAt11nm7pkIXfxYsLONI4YL40tG94sReED4echM9cNw09OE9x3L0lTS+1tCI4ioe5 MU7GZd+LTAqJqWRyU4WgjtpT6jaPx+8V5nW8kCYj7bjk4zBHA95SOqeAo8giDtwb+pBM NI7hXyU8vQf2fOELdVub6uuNazrjruSAc2WgJPz33fbey+lbN7LKpPQYG7z22aKaUtwT B3Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dv7denKsRZZl7kriNX/Y4EePok5pV+nCCZwsOMM8mLw=; b=Wo6h1o0aeQhZDwpO04He2+IXBeBYDb57ojalnfb/PEmvmojbNZLFRNkM6XkR6CvRjj w/kyLimvO/CCNBlcFLHS9oMkE6ltzgHnMDTRDy6ataIzqDmiVAzMze54gv6IDAoPyCod EOFFpVbHYNUKxAdF6wKu/421/UEDqsxgRzXiQXzpgvuGZEtKjmPR2b/aZ2qe4ckTGB+i ARtkYd29VF2IPMPGV4wz+xffRak0wQC0NVsRLIRQbGXtKIoVyKMIwIuTAOk9ALoSCsDg K7als80nb9n7U8ErBMcip+XFMhmK+O7L98yKsbjgG+fgYJaMhWZp87wmjl/DJgS4CaHz cqOA== X-Gm-Message-State: ANoB5pmV+mVUBSrrxMNiRFcXuPfEzwpiESpljVxSRvkG/9hb9kSngWcj oOFiKfyjCoejIfETwb/pBOBdiS4bL8I= X-Received: by 2002:a05:6402:3711:b0:461:b6a9:c5cb with SMTP id ek17-20020a056402371100b00461b6a9c5cbmr18091363edb.148.1669339872596; Thu, 24 Nov 2022 17:31:12 -0800 (PST) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:12 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:41 +0100 Message-Id: <20221125013046.40904-27-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 26/31] avformat/nutenc: use av_dict_iterate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5A3Rr3uOWwd4 --- libavformat/nutenc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 1afdeeb8ab..ff81ee34aa 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -516,7 +516,7 @@ static int add_info(AVIOContext *bc, const char *type, const char *value) static int write_globalinfo(NUTContext *nut, AVIOContext *bc) { AVFormatContext *s = nut->avf; - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; AVIOContext *dyn_bc; uint8_t *dyn_buf = NULL; int count = 0, dyn_size; @@ -525,7 +525,7 @@ static int write_globalinfo(NUTContext *nut, AVIOContext *bc) return ret; ff_standardize_creation_time(s); - while ((t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) + while ((t = av_dict_iterate(s->metadata, t))) count += add_info(dyn_bc, t->key, t->value); put_v(bc, 0); //stream_if_plus1 @@ -544,7 +544,7 @@ static int write_globalinfo(NUTContext *nut, AVIOContext *bc) static int write_streaminfo(NUTContext *nut, AVIOContext *bc, int stream_id) { AVFormatContext *s= nut->avf; AVStream* st = s->streams[stream_id]; - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; AVIOContext *dyn_bc; uint8_t *dyn_buf=NULL; int count=0, dyn_size, i; @@ -552,7 +552,7 @@ static int write_streaminfo(NUTContext *nut, AVIOContext *bc, int stream_id) { if (ret < 0) return ret; - while ((t = av_dict_get(st->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) + while ((t = av_dict_iterate(st->metadata, t))) count += add_info(dyn_bc, t->key, t->value); for (i=0; ff_nut_dispositions[i].flag; ++i) { if (st->disposition & ff_nut_dispositions[i].flag) @@ -587,7 +587,7 @@ static int write_chapter(NUTContext *nut, AVIOContext *bc, int id) { AVIOContext *dyn_bc; uint8_t *dyn_buf = NULL; - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; AVChapter *ch = nut->avf->chapters[id]; int ret, dyn_size, count = 0; @@ -600,7 +600,7 @@ static int write_chapter(NUTContext *nut, AVIOContext *bc, int id) put_tt(nut, nut->chapter[id].time_base, bc, ch->start); // chapter_start put_v(bc, ch->end - ch->start); // chapter_len - while ((t = av_dict_get(ch->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) + while ((t = av_dict_iterate(ch->metadata, t))) count += add_info(dyn_bc, t->key, t->value); put_v(bc, count); From patchwork Fri Nov 25 01:30: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: 39411 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4949990pzb; Thu, 24 Nov 2022 17:34:49 -0800 (PST) X-Google-Smtp-Source: AA0mqf6O72z8opTQhr4W1GaejIhoOmF5nOc23tHtx+t5i0MlaSCzp/oWLPgYQWm6h0VfQgjMLR08 X-Received: by 2002:a05:6402:b4e:b0:469:7e00:525d with SMTP id bx14-20020a0564020b4e00b004697e00525dmr20935117edb.157.1669340089147; Thu, 24 Nov 2022 17:34:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340089; cv=none; d=google.com; s=arc-20160816; b=YZ0oWvi56xXNzBdLIg7XZAiEpCKjeF41nzVB0YtVrjpY0MYBUBRSkrvT8pzPUfbOWw PT2OywxCHcJCumUXTwXw4Vg8NDXGX9C+Le7ogsJBr/PuFon0gLwMRINyZkgbQ3AEgY3b 8VBc+Puc9Bf5OKlw6YNISgwAImpIxsEMVEBtjkAoV0wRAoMW8YJ+jYD0TEWlhDCOZsrG 0P2+WTu/AtwSBEsAhaoxZmtDOZO2bUQRNnSMx+L7+/VBmqnsq4qINwLWV8oT3XhTGww5 gxaVnCH3/94UuJ96mpLUHdg0vydze6F9nzu1Z+YwH7lCx86oBcdTFCeDBMHW5ajguaEE llfg== 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=q7S/8p7+I5NilYw2vZgZmjbAvJ6KWvVkyan6Wzf70xSTW8aKjQP4+1764QZIiDusCS Xlx1PcZo89uaf0YGSwOYmOECtZhlIKFj1gbxJU0aYmjMYVDrUbRpJ77VZ4YpW7HxXsN6 tsT2P4hTcwBcbc+OeA8DvxUNuOIBFMtq/w3P4jlbj5zjS0XmLPiUdK20iQ2JY/zZhrd0 hId0gnW66HE8RrRYZO6fWFtNpq2lilEK2GeIxn3Iu6HV0nV4yRBJbezEzPnvPBAH3jAm kQCFFp0glNyycw73rpLJFcvE47OSLfX3cQ7ePXz61sHDXazbajWevrQ76+q7TU/YbU96 C77w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=dpGj387p; 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 b20-20020a056402279400b0045d4a88c735si2532328ede.220.2022.11.24.17.34.48; Thu, 24 Nov 2022 17:34:49 -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=dpGj387p; 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 4BFDA68BBF1; Fri, 25 Nov 2022 03:31:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA57268BC1A for ; Fri, 25 Nov 2022 03:31:13 +0200 (EET) Received: by mail-ej1-f46.google.com with SMTP id kt23so7238641ejc.7 for ; Thu, 24 Nov 2022 17:31:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hrpBBK3SBN847LZAuL/qymlOSj2nIAa7BzWJxGkJMNc=; b=dpGj387pVEXEU0GpiziBmPmAqabw23DJNiAreXExP5wn0fpHg7HG6bRcQDVzuwXAok i06jKnaQbFV3ReiSfbtNjGehky5VWef2kQgvU/ufocsx81YSJBllnX2LPId3Bml8IVOS CxWilmVnhgDYWXDV0fqLjzQwxJ8x2t1YsnKsmNUlOmXXy4FAj7lVfVyz2tsWcD9YT5Dv +vJUcgxfQGJwqcXaA6gZdBh8bl/tKYTsGn+jGqdev+C5ka1zmSAhYdeyr4CfQ1WiZEKM 4QlxWU6uoXH7hRqa4no7QLvh50eCtLokwg5+ugHVGe4eTOIKxbqb7u5vmXH57bgrRSDI ALuA== 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=pSST0tdIkSXFTqV+Vfn5oywW6iHS8n4sevNp0oJMvbG0PTHsgj1d8c3YSpexHEqeMO pRrMp0oOZlGJrbFOG6YI7G3+6Fi5yDKJV7soTZQs9N/AlDLfnUpnrWCoS0UEc2SGxLzI sUNpzYWoDkx3ZbIH9sszwTY0I4IsqIiHb3vCD2ba22Unpyf00B+7e838EkXVmkQ+xc/+ cjMBbYz5dQpi2yz6C8KHQuSjuws1EoUPCzsJOBfcotYOgEuQHl220UEW/ztM0KC0zPqE 15YhY+4/hlOG5IlT0EDyVG1NUJbBBoKLJxnpcgoWNYMq+S9LPafJsr/0kqJp5KYPC1Uv Vn5w== X-Gm-Message-State: ANoB5pnuJPu2ba8uWLqXL0HSNGGtfE1S/0K6kMD2Gp0lJH2aUkfreoDf D+RqqsMydmiXpdRghHJclVgMJZFepyU= X-Received: by 2002:a17:907:1dc6:b0:78d:8533:be13 with SMTP id og6-20020a1709071dc600b0078d8533be13mr29508075ejc.716.1669339873401; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:13 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:42 +0100 Message-Id: <20221125013046.40904-28-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: q0rn6U3WFN01 --- 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 Fri Nov 25 01:30: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: 39435 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4950039pzb; Thu, 24 Nov 2022 17:34:57 -0800 (PST) X-Google-Smtp-Source: AA0mqf6W6x+diFUAwmnDvNrBrBI/tn/F/eemkiRjpq3LerO/LKhFLpKi3FOEs57Qw6w5+X3OMHRw X-Received: by 2002:aa7:df86:0:b0:46a:9fc5:479d with SMTP id b6-20020aa7df86000000b0046a9fc5479dmr3142594edy.192.1669340097152; Thu, 24 Nov 2022 17:34:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340097; cv=none; d=google.com; s=arc-20160816; b=vLTIYQ6FvOBVE2hbOP1PL2/U0Fj2FBdR414WTtTjwy32yarW6jIZKObX3rZ31dBniT TX5jxlXkwRde1MWTYFGP4m23RDkAtzyxa3aCqRwRmuNtMt5HJuov2o6atZZx4x/fEEO7 D9yov4smfkJko949adSEg3Fc6b9YGSr1nIkAcwKTfElClFsewiRy1h9xIV5k/kOa1h4H dLdgJD/mcQrXB9hSzHefcEIiMP42rikD6UxBiJLlltHbhiO3krHwbXImz5PRHOsRyQa7 u0COOLlzn78rTJGO1JdfBT73TH1UFo9+1qidFJexLoUu/UigmRNgVYpgDdTKOjhkD5uP D8rQ== 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=l2oo9pkyIUWEl3LT6FZ2KCCSvbe30HShA/DTeKF2gd//p79mKXQVReQlJMa/AAZkJa 3dz6pXAn/U5R8Mb7QRTgCgXD+IqZ7tEuNl/4Lu8mITwKMuQOWZ3ebRalgJbIn5ZwiJnz T+hjbKaEp9U+1ZWFF+NSkwyRokqluw7iM1WJxTgL7CTEIVd9q/SfmLxI8OS3aqYy6OuD LzOhApg0WXP8JtP8A+0/UvBM10K/HzwTOVelcaTUvEdkYxgt06gBsljwWUNOLF/65mj1 beCJdDHggDaSVenIHv9uC6wfzyJBWbgcMS+Pm0gVzq94vmdY3b8Fh0RzXFj7wq8Qkn/Z Ts3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=b1myw9Nw; 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 oz20-20020a1709077d9400b0078e319dcca7si1606829ejc.744.2022.11.24.17.34.56; Thu, 24 Nov 2022 17:34: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=b1myw9Nw; 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 4661268BC09; Fri, 25 Nov 2022 03:31:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79FD468BC29 for ; Fri, 25 Nov 2022 03:31:14 +0200 (EET) Received: by mail-ej1-f46.google.com with SMTP id ho10so7290898ejc.1 for ; Thu, 24 Nov 2022 17:31: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=VgLhnwDfUVeuMSRzpv/uSUy8TLeSA086jU8CqbYxcpk=; b=b1myw9NwT4IpSg1hzYmMHX4/hQmeVQuBhedAtK5V/kWhxL5NAOdHe4XWY5RC+5h45Z QwJybA9G1Z22JFB07nXAF0UCQb/gnZwLlKKqcX65GaGI52PRS/3ZL7H5W27rSn7oJ80m TYlI4gam/VqtCinBWmse/VE2NB5We0Wvm2GIEVohysz4fUtQagGmQ5wevbRhcwnS9U5e B3my5Js8khWNzJZyM0LWe2wZJDm2fNr8wHCBFZM0ZCqr+hWLA1WP2iK7xqLW827SCkGe 2TDr985V6De4bI+ZN1ESxi5H2dkCaTdhV4XZ0BMOPiozTlL3S0x3ekE5L85ePhul252y Z/2w== 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=oyKOxL+Yz8fhqMrXfGl0BK+XOQypnvj1f3tWFNoUl7Q2DRoTYW2wZlYcfVjkQ2ROin Wu0ET4ep/4WDGaOdzQbo/8vQHRvGE/Y9vrJWEgzJfN/SiidLcz0WrNBj9hOWrq1leOLl Yam9laSZ12eePTrLkSU29rBkDC8m1d3c8JU3fZR8VOJwKn+CGCRl+BjynWqDjW7LTUb1 3F8P/9ccZkBhLNTv+O7wNbU+4lCqfzb+ZbSaTvBk07rdS5vpNppuR68FrpuuKmMDIAr3 dKCrOJfzg60WEWRE3hYmJy1pDwpaLrBODxd4q9Eg0zA11DJ7zPBElvONbboHKdSln7rI HbRw== X-Gm-Message-State: ANoB5pkzyTEXGfnywmFAz+0Fjnw3e80G22xBwOqAzGWF1bkA8SKFxjCt hPjAj1z6UJdOvxmH6sjwz8GU6oA/k7M= X-Received: by 2002:a17:906:3385:b0:7a2:b352:a0d3 with SMTP id v5-20020a170906338500b007a2b352a0d3mr29338963eja.399.1669339874201; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:13 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:43 +0100 Message-Id: <20221125013046.40904-29-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: j8HTLoC9tqMn --- 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 Fri Nov 25 01:30: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: 39436 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4950112pzb; Thu, 24 Nov 2022 17:35:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf6KhcARiEB0B3d970FGj4UkBftid8XKTVd7dktR8270VgL9QPOvrNCM2dSSZvbxorX3I2Xn X-Received: by 2002:a05:6402:456:b0:461:9955:b54a with SMTP id p22-20020a056402045600b004619955b54amr21284262edw.159.1669340105411; Thu, 24 Nov 2022 17:35:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340105; cv=none; d=google.com; s=arc-20160816; b=C5Bxks7F2yUm5KKjXhbWvhfPvq0539zCrkfmrdbDdQLfaCuroMR3kTuuOwfdLKGoOc rsYzEAWdWcFxFxbuCZELqFwXyA3EuEvAwXmCIxHj3JQB6EuGdc+qOdbOy3LauAhWbk4u ottWFui3zLOE/wEdidPj6MZJKUIkuSl1y7qHyr5/OLRDqJ9DahSUZUf5HGinWS+UHAr1 CPSJT8tSAElluq2rUvxHgbqtzURYvSLNqTbdZUqZVLdwJuJq4/KZ+wh6UpxGGMLjW+2d xN+pcFR57JyjBc4aIGFQxr+iEUkET2d/XHKw9I/EP2Z1a6Ktdt7pC5FOJTAyowSdFCao sbNw== 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=floTZOYmRbd3W/8Q+NLQeb35LyURfyIuMg+CWHJFBueC7XzejM6BPPqQ9v8H2gZ36H /tbUPU2hgflr6MEsPOhPb4q2ND53bZ2tIV2uAWTR7RvNGt+X3nhQgauEdSV8hOdWnVtJ I7LBhBBd+uf/SkF2Bh8MCD6Cya1RJ86biCL/xJb3VojAUHWEjCDed/p67N6+9NYYg+Pk O6hVgeAqyFZn6Ql6YZ3QAOg2xgdHUKu4NyKDn/pxFRKLeE60oQM2hcdx+jIqtn8quAwY QgalhUjmZwpDa1jBAIsyuQEhNWx5Y0m9BkBdvOdyqMcmBoLm6K4vqP6EmJ+Hlm/cYgyZ 3ivg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=oVBz6h87; 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 gn13-20020a1709070d0d00b007824786a7easi2275581ejc.724.2022.11.24.17.35.05; Thu, 24 Nov 2022 17:35:05 -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=oVBz6h87; 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 401C268BCBE; Fri, 25 Nov 2022 03:31:31 +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 8811068BC38 for ; Fri, 25 Nov 2022 03:31:15 +0200 (EET) Received: by mail-ed1-f51.google.com with SMTP id b8so4471378edf.11 for ; Thu, 24 Nov 2022 17:31: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=W7yoqjrBB+ge8dqCjWZzJBbZ8Tp+v6XEVEhqmUELwho=; b=oVBz6h87ZsHymSCrvm/M4Pqws5rO92ld1cDRJHt7liU4j3mtImcN44Qn8ycVOXoqVE /qFc9YhrZes2RYmpPdNvh3E3FVBfuChrNl21gH0V9IytMIMn0TdiLjatUHF28DblDnhf +Tbdlk9ibffmYCwQ7hKYQESMsiSk10LAQuDeXOUQXIxtGRS6LWuPD4kcfSC3F5axVx// GXynIcZdnnF3qlhU4IQpsGkosIDiaxO9c4sNFSCp+hUQUKyrcw+2YjqnF9yP9x4hBAAP fWlr3+ZqH9bnl7e7OCR3pc4fI/oucr2uvvqzVV9dURhpq3qiSs6/MsOMWNORs0p1tdgl rY/Q== 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=nCmDU8GhgIdRAwlUJebMLpTrfXX1zb20caK+YOHJnYpME0NkeSFdIh8Yt9NXPPyl1I KISbiKNOI0FHIk6BgcdiKLjtDGKgPJESB2c/Z2fbysDbMwzwL1HxQ0juNDB7+ZW8CsWE mm4sH1o8sa3djdIDvrrSAau7UiA/8TTJANckGjyeHbhHKiZ6UsL6nAk6E2I8I44HPO7Y ihi42/mwV8i45M3vAF75BI43XAKmMR8+6Z8OpDVzvgtiZMDVknXiPsJAcDTG2aaGcAlH pGtCxuZr0MDeC/yP18XW0Ohx5ScoyGnXI1Ht88+y62irS4tJwVR76urnq2RFHpqqkkZ+ 4iJg== X-Gm-Message-State: ANoB5pnndapQ2NUcb5VdYL+SfuTQJLMnAKthV+RM/TXdLul4pZFtaIwq IxNWgyxKYxJId39pbfKEjwwGjFlcxT4= X-Received: by 2002:a05:6402:1772:b0:46a:7f4d:efe5 with SMTP id da18-20020a056402177200b0046a7f4defe5mr5516455edb.304.1669339875167; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:14 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:44 +0100 Message-Id: <20221125013046.40904-30-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: W8PxzZXm45bx --- 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 Fri Nov 25 01:30: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: 39437 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4950162pzb; Thu, 24 Nov 2022 17:35:13 -0800 (PST) X-Google-Smtp-Source: AA0mqf4kimTAyRuoak9Xgon+v7vVOrv7nM+TmFG3wwr6Zs+1vqq8h/c3EbOjVPtB2/Un6V7H3KWd X-Received: by 2002:aa7:dd45:0:b0:45a:3c66:b0e4 with SMTP id o5-20020aa7dd45000000b0045a3c66b0e4mr33312076edw.33.1669340113436; Thu, 24 Nov 2022 17:35:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340113; cv=none; d=google.com; s=arc-20160816; b=NjWqomc0G9UTZ9j7+pS1BwZtHaLjiLcOoZVuMqpuIkwja12jIEav2E5HG9aU3CqX+E unNw7SXEwbxJ+D/vOJMCLqltyD7DoXTYUHQkymUl/Xb637+t8V1zupGJPaevPRYFYGg5 3/8Q4QRoX79X2mYdVB9iIAhRpo80RPB7GqLVRZi9dPOw4IjS6Q+cnek3MIvK31xmOwxr feBsbvnmNj2n2uGTMMiyZZI6oKsk371xZPoPJHDomR/uMM3xrEMGMwUUXKoy9Exla1um jPbPFKqiwsohRjRhsalQ5RA9/ip6ka4p1PBYDqMbr6wU0IwEnB8CoC6Wm0jxHrldRhts UuuA== 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=0aESey5Zzr9xzHNqwSMUDBBULH8j3xBg+wFwVK8NLWKP8IImWazh+VyxSaTtN27Gv7 A3Mc6f0fsDMmGL/nTUGHeoRQW/YBJHEDxkHLrV9S/6FZBeEohpF8TpXq+Ix188DmWpSr zTMauXKmVDOY0eLgVm3OgXXsuumryMmKrjKsVU3NkT/pj2bk70tgqgwqteYT8yF/CaSj AhqyUFG61iqYmeh5wPH1t+BYCATUAoO8aLPsI7OUEimW61NHNReN7lQdHmWXy0ZlkQ0h neSZGnX6ao42o29tLc4tfgFIasqwWAuum8g+CpC+yEdcDOdqfEjl4HT/YSKk1oCgReBU Xfrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="ABD/6oZq"; 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 q6-20020a1709064cc600b0078a19032c70si1469951ejt.334.2022.11.24.17.35.13; Thu, 24 Nov 2022 17:35:13 -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="ABD/6oZq"; 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 33AC068BCCF; Fri, 25 Nov 2022 03:31:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B05268BB53 for ; Fri, 25 Nov 2022 03:31:16 +0200 (EET) Received: by mail-ej1-f46.google.com with SMTP id kt23so7238824ejc.7 for ; Thu, 24 Nov 2022 17:31: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=Z1vg7usU/5kUa2r+s6BuRejVtcTGnPRnxtQJYdaXREY=; b=ABD/6oZqp2diNmx78Mmvv8cd2XY5iVQpVHYh2UoY+OFeRV+aABvxVBoMkoQMT6Rnep aEG4UHqOV44aafFJrIhXuzSHR7gthrGC2JESnoENUWRKl49BMUKmHwjytXvA9t1t5BXi /LlXZKCIbE+smXW/ep5dEIUFad5JHCJcDD2kYlZnkT0LB00pd0b+KKasSRER1GMR8qlp XNuFw4qZT1l/38gdyKSxX4VzrNczCcbMuefjgyK/jAL9qApiMmPAuTNWDCQ939T3+WPD ueJydWpEyL0+WRslqodmpZrQ4rvbszLDc6IvK7XnHMEmuF2pPlKm7YCCJpVU2jXct9R6 G0uQ== 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=eS552o+EPH1u+3759WMFg3SBaxjrWUKKom4bVelWUp4L6ltIGsSxjJvKOrMWFzTFEU 2vBmL6pAnLn/jeK0ybqfGMiG44PVxX2FwCRKgKefjWc6/8IKyyD5/45r7Jsp4PTCJ7Mv JCr5ZC0qpIC8ASQN/EIDnMR+rrJA9A+DElwGSxoKqt2yVAcKCGEDgsGi80JCY8Y9ESeo W5yUvMWBEZqTrrxJCl60Y5od72SsAXZfVcF7JjTXMF5k6FlMoOSieSNraQXBMQfpoxHE lsikIixX19rtEPVoYCxrIohuN8R87WQ45SCY9PW92e4anTRXLF/7Me6ElIONpBH7ukfo zpzA== X-Gm-Message-State: ANoB5pnoXh7voSzhLkm/BDH5ygrdN3tj5n02Ml/E44MUAprgjdbVMmjO PXuXENQVFpFCdq8Z1rD3ELBQzBunBbM= X-Received: by 2002:a17:906:e286:b0:7ae:71d4:37b with SMTP id gg6-20020a170906e28600b007ae71d4037bmr13533836ejb.237.1669339876046; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:15 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:45 +0100 Message-Id: <20221125013046.40904-31-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: 6m5dMdZaTSt4 --- 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 Fri Nov 25 01:30: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: 39438 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4950214pzb; Thu, 24 Nov 2022 17:35:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf6nu95OLlzytZins3BSiwIj1/lOfmaee6weyfpo3LDPS6heu/lTp9ZocvIYx9GiRwjP4wy/ X-Received: by 2002:a05:6402:1814:b0:46a:b1ba:22b8 with SMTP id g20-20020a056402181400b0046ab1ba22b8mr1033257edy.316.1669340121334; Thu, 24 Nov 2022 17:35:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669340121; cv=none; d=google.com; s=arc-20160816; b=WbmeFDP0C49iW7q+E2SFJ3hXYHYbKE70dAN9JDeW0BEbU8tUiVyCKTLcJI/fzimW3M 3KNlgo3yBaHvuwGpDX53PC4x7Uy/eBCcj3ntUTyTEaEj0WuWH1JR1cRKDGL2V3gp/5Za N13ycUWQhXIFozx3KmsRlrBG60jmYv9kU56xCFTciuzxMVR4FJLOpqdI+ApJh7MGaI2I Q3Zd611BwcEUi8D0aLvFmeYYSZVxiQ0z0/BIYg+gSJLWUKcHRUS/Gg5WycwyRVcPzsJU jvXY0osZX3jxcTh8lhX5JEHhPZsqd9U6bN6AMzrikpvaTcwSAGKUMgHKKFpt9spxvNUx zMWg== 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=IxiWQqj564/5RK1apTPaF+24usRgE1J6XCDbfjGvOCx5+FglR0Oo2H7ncvDjbWq6Ln wAwEY9BzwX7FgGLb7Ly+WSsmwy8Hk4jRhTP+m87B/rIi00nlvBz8buUv6sBumIa8jhNW JwEJFZMk8e4a7P0It9qMBVWGGkVlgKEMwJenqbxf7H1pNCYIWvw/1D5c45eC8kqyHM0N cLWYsrCEiB60VB0ZfZs40nKyDAXENBiAb6DrQD73b4w5tyA+/rs42twHM9yXiJu6lCEe 2wHbhr1EBEPBkZzbn40sr2sNwCMQXH7KPq0uQGMvBh7RgrlL9FOdnh7SU1lKIsr3RvNI JRWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=anCBVJdz; 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 n10-20020a05640205ca00b00459e1ce80a7si2399932edx.241.2022.11.24.17.35.21; Thu, 24 Nov 2022 17:35:21 -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=anCBVJdz; 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 2BF9568BCF1; Fri, 25 Nov 2022 03:31:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A30F968BC4F for ; Fri, 25 Nov 2022 03:31:17 +0200 (EET) Received: by mail-ej1-f42.google.com with SMTP id m22so7216748eji.10 for ; Thu, 24 Nov 2022 17:31: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=75g6kK4y61YMFJcRLsjFZL3LzCLJ8EANR6p5SOIu8jU=; b=anCBVJdzhbdf9QPFhDuz3pNIJW7adqrIxLIUwK9dfdUJULqACm38qXaHivbssawotu X+V9fOoT7l1h8Wn7LxS3NH8QImW0YLv+dJzsL6X/WbicmXDazcFw2Tg8GnGJRzDx8C8f DsX8KmtmchtUOW7f0/rckF8YHpEtsmx1f1RrjkY9H+FSibwSvJ/7vNDzc3P8PVbvO+mM w2Jk5eT/Q1tEPEnrkdoSnL++/HxvudUvbBa5a+EbLW6sfBRlkRyx9Bw6FfbAban31kkn foknA5eeDclU7xRMQUcfFfKlFEXNoku1XuxMQycSvniO0eTxBqFIU9F3DpLpPgkpY8MX Jkbw== 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=B+0TeC3dLUSq4/98cE3jUln10/FFhDnvXoUPYJSLHWW/hORyl+IV8Eg7/F+/tT6Pq6 rAyjVQsfMtipFe0FsZFimDaSCpTE6+w26QUgW5pMLUn/BT7vexGQwW1R9wf0JAxOhEg+ 8GH17itvCPydLYVx7b7YYIZxPBgLfBDPkE3UxU+yfb6l89+qWJZL0NzBe+VLI6qtSGzA ETurfIvTas5OQ7c7eVYuBmXwBFCjLvo1m0SxZdms5HkKr66W8AgMc20VY/GBj335Grto Uz2L65r70uQ/6jPFPa1TM1rQPm22k/QMnFRYWnIbj79Muj7vyG175FCyCPkEuVEag4n4 lODA== X-Gm-Message-State: ANoB5plr4rNUkaPZ+dkosIahVO8Pjy2PvNESwvPZCqlZgOSZON/es0j6 BkBEHruwHO8JeiR7NuRlOIhwFcM6AiE= X-Received: by 2002:a17:906:cc8f:b0:78b:8ce7:fe3c with SMTP id oq15-20020a170906cc8f00b0078b8ce7fe3cmr29664741ejb.557.1669339876881; Thu, 24 Nov 2022 17:31: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 jo9-20020a170906f6c900b0078b1ff41f05sm1011498ejb.43.2022.11.24.17.31.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 17:31:16 -0800 (PST) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Nov 2022 02:30:46 +0100 Message-Id: <20221125013046.40904-32-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20221125013046.40904-1-epirat07@gmail.com> References: <20221125013046.40904-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: 1SGsLZMYpzMR --- 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); }