From patchwork Mon Nov 14 15:13:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 39274 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2487830pzb; Mon, 14 Nov 2022 07:14:47 -0800 (PST) X-Google-Smtp-Source: AA0mqf5PKCq5bLQHDdL+FHrDc+/Acb1dB8BZmMW7jJXqUb9s1TbtWlCu+n1KQLsWJLutcW7Jotcq X-Received: by 2002:a17:906:8052:b0:7ad:821f:a3e6 with SMTP id x18-20020a170906805200b007ad821fa3e6mr10068867ejw.688.1668438887569; Mon, 14 Nov 2022 07:14:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668438887; cv=none; d=google.com; s=arc-20160816; b=LzprF28nASdXGo05Pr/P7RmIDYR/iZhqriHw6NSQwD90+cBgSUNDR4S/3jZj6SVj37 zc4wHJIUO+SGqetTD+UaO+rzNfKOLLUqOhcSIAWN9FbPRo4REwYIGqiAIeKkx6OE0g// JU6KWXS7PHOSVhsXer6YywC6AZDdx+8tc0WF+A5JjsI71vadatC24b76LQyXkfGZKSmP gv1zJgiuLqW0GqxLC5Lw09lGUbA8vLmfmDqVG3Ee9L8SzFpLCyx4HuDo98bmC033o3wa exJ82b4x0UKWo+x81GgCSRCJOxIA+3F8vY87wUow89ASwftkiSw2kIzUFH7oG0a/L5R4 rjiA== 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=Tw6mDuSLRlYEagq0CzUvGazjHzIdRNP1R2id0OJPweI=; b=rq0z2in8XMKYxZIaJ0SsKwnp+PjIVYPtdBmcVqDkw6RAwyqQZ3qlseb0ofv50nsnuX xbyorl40YmFjxQcDDFXIB8RnQtkUbW9Ky+dvL+BjhPNRmRW3L96PkrGruNTMBwYz77YV EQVZgj+HpwyKwSe546IDR9fildhU6ybhsvQf6764i6dLA7BP4hic6hXzm8izqsJ7Ctef ByP+SRLpWMdQRs7jWyXoVSzagpE4f64P5AABXwwefyjDAyBeFfRHJRVpjICkvrC6wNL+ lCeIElG8IgpjCzKDR/oDpWpSP/VvVAfNelwjOxM5Dl/xwWfnlvgeEFsMKteKrt982Ite kdKQ== 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 pk28-20020a170906d7bc00b007a4feae7ae7si7255576ejb.575.2022.11.14.07.14.46; Mon, 14 Nov 2022 07:14:47 -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 B59BA68BE24; Mon, 14 Nov 2022 17:14:28 +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 1AB8C68BE0B for ; Mon, 14 Nov 2022 17:14:21 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id D30BF2404F7 for ; Mon, 14 Nov 2022 16:14:20 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id pIDsAYi9AT2p for ; Mon, 14 Nov 2022 16:14:19 +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 03825240499 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 CB6883A05F9 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:48 +0100 Message-Id: <20221114151350.5134-6-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 6/8] fftools/ffmpeg_mux_init: do not call av{codec, format}_get_class() repeatedly 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: CEMUAD/DNeXF --- fftools/ffmpeg_mux_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 7ccaf9da78..6ed30eb498 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1727,6 +1727,8 @@ static int set_dispositions(OutputFile *of, AVFormatContext *ctx) static void validate_enc_avopt(const Muxer *mux, const AVDictionary *codec_avopt) { + const AVClass *class = avcodec_get_class(); + const AVClass *fclass = avformat_get_class(); const OutputFile *of = &mux->of; AVDictionary *unused_opts; @@ -1742,10 +1744,8 @@ static void validate_enc_avopt(const Muxer *mux, const AVDictionary *codec_avopt e = NULL; while ((e = av_dict_get(unused_opts, "", e, AV_DICT_IGNORE_SUFFIX))) { - 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); - const AVClass *fclass = avformat_get_class(); const AVOption *foption = av_opt_find(&fclass, e->key, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ); if (!option || foption)