From patchwork Mon Apr 8 12:57:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47927 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp2457289pzd; Mon, 8 Apr 2024 06:02:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX8UCko9ZFkUczIvuoayg+SDOB8Xt2KgEdLjgQUj8J09sFkQelwa4VHXcMt+dRvTyNPtKf1uitwAaxQrXCvLSNrIwMCLjNyzQDjhA== X-Google-Smtp-Source: AGHT+IFs2nIMwwYIe7LHKiUqDG4fuKL5PYaBswQeiZ0O5xAewxKOMbMimWcAS1SkN5N0EWJMep0e X-Received: by 2002:a17:907:60d0:b0:a51:d49f:b6e3 with SMTP id hv16-20020a17090760d000b00a51d49fb6e3mr2146117ejc.54.1712581368732; Mon, 08 Apr 2024 06:02:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712581368; cv=none; d=google.com; s=arc-20160816; b=zhHThZKRJjvZI9JDgnHZZnXumEgDxb3gpvPJ+rxGyIb36ordTTpQfYSYpJHExOsyUu oeYOiw+qDBe9gVFpdN/pmEk1CKEiRjpd9HqMq4V6hADorVVyg1GMIG0GBpDr3LoxoFid VO41XpaD05L7bbR7URQjZ9J0GqGcR6DkRQG3a0DcTrdxOBkHzfGw+vJGdowTBSq5tVTN tiUNO9EO+r6geXjwp1NbOsP7sCaomFr8UHUScACIs4nwtW7RXnkuvBBghMg0AQdjEQ67 2QKqqiSCvd30X7Jw980suaGzUGynLyDv8CVkXiduiMolof4rqLtIxjDV1nl6pD8tzNN0 uyyg== 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=cYItbod8/iENQogQIBObo8hAuoH53dgJHP8daiPpD8Y=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=Eeb8FEW0L5Hw87+DmEmyME0fDbCyTWQebjsm3mECTRGpfdJx3hWGukKvI3dG9Jh7Bo atW5PExiXPT2r8dmf+4k8oeiMgxWlQbJxKfeNOr0RaYxOp3skoUhSH9aL23LUTZCWSaU C7ZVUeK4UJESgYmVeiZlkTGYjsiRfMnQqla5pUm2b1lm27sEgUY/APFExkXXX8eRtJ8J 2hVRxC67THzHEger5HYC/9zKyzC9Sf/FWrBDvl1fd7IWJ562krV+6Z5MlbPzNxZxEUzu 8iBAlgr2czHhiZXdNlObx8mRpyeYT6LOPtR7phPuF+1MbHl2EmAmf9kBhkazwg04X/Fk erVA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=reQVMhYX; 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 he39-20020a1709073da700b00a44d0209395si3760031ejc.915.2024.04.08.06.02.48; Mon, 08 Apr 2024 06:02:48 -0700 (PDT) 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=@haasn.xyz header.s=mail header.b=reQVMhYX; 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 AFDF068D326; Mon, 8 Apr 2024 16:00:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5176B68D208 for ; Mon, 8 Apr 2024 15:59:58 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712581194; bh=KE6FM+sgWL5IZpHrMoqrtWHn1iwrtuYEs/QdlL2BxTM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=reQVMhYX19+27l44tUjwurazIQ0beMlW8aL8rWRtgb+FBk1ODhEyVJ4VaBc9W8GT+ Wa95zC2SoIUtZaOlnS7nL3pLhl1rNZxvlhN8d54jmT09f2Vmugmgp8m07M/ya2yRNZ Re/br3aF2v25/hFm/UsEEWbssPEFWP3e9uYfotEI= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 5FEED46859; Mon, 8 Apr 2024 14:59:54 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Apr 2024 14:57:13 +0200 Message-ID: <20240408125950.53472-10-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408125950.53472-1-ffmpeg@haasn.xyz> References: <20240408125950.53472-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 09/17] avcodec/codec_internal: nuke init_static_data() 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: mKqTdQLg5IEL From: Niklas Haas All hail get_supported_config() --- libavcodec/allcodecs.c | 7 +------ libavcodec/codec_internal.h | 8 -------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index a9f1797930a..1f22e06e710 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -916,13 +916,8 @@ static AVOnce av_codec_static_init = AV_ONCE_INIT; static void av_codec_init_static(void) { for (int i = 0; codec_list[i]; i++) { - const FFCodec *codec = codec_list[i]; - if (codec->init_static_data) { - codec->init_static_data((FFCodec*) codec); - continue; - } - /* Backward compatibility with deprecated public fields */ + const FFCodec *codec = codec_list[i]; if (!codec->get_supported_config) continue; diff --git a/libavcodec/codec_internal.h b/libavcodec/codec_internal.h index bac3e30ba2c..d3033db3375 100644 --- a/libavcodec/codec_internal.h +++ b/libavcodec/codec_internal.h @@ -174,14 +174,6 @@ typedef struct FFCodec { */ const FFCodecDefault *defaults; - /** - * Initialize codec static data, called from av_codec_iterate(). - * - * This is not intended for time consuming operations as it is - * run for every codec regardless of that codec being used. - */ - void (*init_static_data)(struct FFCodec *codec); - int (*init)(struct AVCodecContext *); union {