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) {