From patchwork Mon Nov 14 15:13:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 39279 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2488763pzb; Mon, 14 Nov 2022 07:15:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf7YQkRX3WCwt0ukjHFCZuv18ZtjYkCL/Py9RD6DUOcjBBGAAfjBWRotl3wpcNDBAEAT1U/O X-Received: by 2002:a17:906:300c:b0:7ae:fbe8:a73f with SMTP id 12-20020a170906300c00b007aefbe8a73fmr3966944ejz.479.1668438934599; Mon, 14 Nov 2022 07:15:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668438934; cv=none; d=google.com; s=arc-20160816; b=d19Uv4rBPTKqPmR3GGXmVYreC4doUro8EcDK1Be4hldU90W1/Nu+4npX592MJw1tLw DP/F1/CGRqm/I5PgEQzA/s/+FXfug+p/bdmIKxVZd2Tx4Ss8FS6O2AYTJA9WbY1mIo/2 ntnsn6uxUHCIkUC0Xfo1nYGHZjwR1kEwHv9v3mvA8YcsDx8iKR3wDNmR8xzQjvw67Su6 qTKFbMFdxxuIlA7Vu91+ln/dCby0Sh5tu8wVAKGjisu3Tj8gE8FRhGEL637QCLaUCxUU 9w5Y4vPtpVUjdu8s3t20UyO8N7vLnrn8njkbxEiV/xRCEE7BLfO2s3h4MH2nHWnjcVNr SRgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:delivered-to; bh=Vnut2lhMv/86wht2quUdJc6B59Om8CxtQo+mtb+c+hM=; b=VWMgvpA93LlFzZmddXLSgfwj0f8asXDQtqFWKm+6IlLUhGiPjZliBpoKUJ3995jka9 AujHoLMFbfFqfXjj/20sdRUCiS30JgrRRncPyx/GFPblO7tTB4+CbVrjH8wZLM3AKAH0 icpp4XyCXyQPXMmRBl/b+6mr++gc8L1cUnhvvrz1cYxCBRCZgN4ij74NSxe69+Gk8TP5 d7kNq5ktRvDrVwFRr3YrZoE/mKIKIJy9yUC4ESmQlZwCTtVuN8LwQL2BJW+t/eJlbs5B u/45AvCYM1SzBZTsVeEu6dTdCDgjmsjTBe50osCsh2CsM2J/6Ys7fOoNjee3w1V+jWF5 sV5A== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v8-20020a50a448000000b00457e9f88b90si9368499edb.246.2022.11.14.07.15.34; Mon, 14 Nov 2022 07:15:34 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BB96F68BE45; Mon, 14 Nov 2022 17:14:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B587868BE0A for ; Mon, 14 Nov 2022 17:14:25 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 228642405F9 for ; Mon, 14 Nov 2022 16:14:23 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 11ZdKuWZyfPN for ; Mon, 14 Nov 2022 16:14:22 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 2F2B82406C7 for ; Mon, 14 Nov 2022 16:14:19 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id D6E1D3A0656 for ; Mon, 14 Nov 2022 16:14:18 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 Nov 2022 16:13:49 +0100 Message-Id: <20221114151350.5134-7-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221114151350.5134-1-anton@khirnov.net> References: <20221114151350.5134-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/8] fftools/ffmpeg_mux_init: use av_dict_iterate() where appropriate 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +wNxYZA+9gsk --- fftools/ffmpeg_mux_init.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 6ed30eb498..277cbd1f64 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1737,13 +1737,12 @@ static void validate_enc_avopt(const Muxer *mux, const AVDictionary *codec_avopt unused_opts = strip_specifiers(codec_avopt); for (int i = 0; i < of->nb_streams; i++) { e = NULL; - while ((e = av_dict_get(of->streams[i]->encoder_opts, "", e, - AV_DICT_IGNORE_SUFFIX))) + while ((e = av_dict_iterate(of->streams[i]->encoder_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 AVOption *option = av_opt_find(&class, e->key, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ); const AVOption *foption = av_opt_find(&fclass, e->key, NULL, 0,