From patchwork Fri Apr 5 18:57:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47866 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1157929pzd; Fri, 5 Apr 2024 11:58:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVAazOBYD6y4swsKv05/uPrH7/KnCqe73wZddGyssBemkN9zBaWGCBe7E4YLUDbmqZmtoD8OA5uxvj0HxpG6EgDeJ/mBuo/Inntew== X-Google-Smtp-Source: AGHT+IEiIDi/tuP32P6ZE0/BTueIND/GlrIllAp5E+2SGvy6B5IO0XyPtsAu40aKSsKvpK+CC5bM X-Received: by 2002:ac2:5462:0:b0:516:a0a2:ba1b with SMTP id e2-20020ac25462000000b00516a0a2ba1bmr1616610lfn.47.1712343510912; Fri, 05 Apr 2024 11:58:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712343510; cv=none; d=google.com; s=arc-20160816; b=FReP5u9U1L9L7mIu76MJlDK/NEdBSSwhvc4jv86qsuepLVpMEYJf2RQFFDMbNTldH6 Rdt79VF7BCW/rVNl9r6Yd2dmwJD018R+c87yhWUrJFAp1eKo/FahjisfasyRIWH+b3F6 ks1y49JlzCrg00eHA0ucdPOvvWcUUr+IM2zS8Ri4Fyi/Ra9xb81J50mbxSgYnPOmTaMP kVKyDw1McefYujbc4t3jzHJE99hFM6u/3CdlH/lZGz0LTjzKAdhv2sTSyp1WEAXe5RbR TEmPsbN4xL23A3ofAkc0fDqL+kwX2i2FgH4t4ud/jBNDSGbep9PY4C4+wvhKJOZds9nC VnYA== 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=0A/a30l+SwthKOWZ1UeFU/0StsT3aWiYAExDO/VDwcU=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=XBcgJ67/NDQ2xCM/P+9wtZaiIhtQnODyfYiMIf4bPYCGVAtCn3Xr34mJBaBXL4TbqN b4Ux0OEM0XYegLNuQG6RzVnMY/FWCsfN00R0nAey4AMQKH7qwutLBEIZrjHMGmeU/ba2 7ZrCTsq5UTGs5TEAFHQh268i0J47CxpIXHSHwpd92QXDavGpeoKNQVyweG2BJtiFFhN2 t2hvk3KuZVW0RWttxoiGdK8uplkTl5U7hQSgH4qW5xwQ9sbwBOBrjtW7SvEvoePjYZh1 WmNIm2wbNZEoV30jsl60zKPVzc9rqZJmGK5z48RC0oooOyJPWGI+Mb6xoMfpWF8LT/UM WoGg==; 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="gvQe/Nqd"; 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 z36-20020a509e27000000b0056e2e603216si952228ede.391.2024.04.05.11.58.30; Fri, 05 Apr 2024 11:58:30 -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="gvQe/Nqd"; 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 BB84E68D1FC; Fri, 5 Apr 2024 21:57:39 +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 7452368D1A6 for ; Fri, 5 Apr 2024 21:57:31 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1712343447; bh=DqhcKgUt48Ko/wDcefHE/z8O4FDMP26Gj7o2J7WH0Ig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gvQe/Nqd+nPKrzEWJvXXVwu8SkIfOHqjB++kcLnJRQvKs1O+BW+31iXqAFR4i/OiW yarHrj/cdIHxR/7xF5gAycr3X9M9mBPtNsZgtMMlbgoX1j2VOFZih8RXgMUFxT9SHi XO1domjHBQd7Fj4OKUJreJaiFOrQLTJbkFKhZQGQ= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 3282C4301F; Fri, 5 Apr 2024 20:57:27 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 20:57:17 +0200 Message-ID: <20240405185721.111072-7-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240405185721.111072-1-ffmpeg@haasn.xyz> References: <20240405185721.111072-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/11] 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: QOAH5nH+Dheu 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 3c6328364cb..f4e97d0fbcd 100644 --- a/libavcodec/codec_internal.h +++ b/libavcodec/codec_internal.h @@ -168,14 +168,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 {