diff mbox series

[FFmpeg-devel,07/11] avcodec/codec_internal: nuke init_static_data()

Message ID 20240405185721.111072-7-ffmpeg@haasn.xyz
State New
Headers show
Series [FFmpeg-devel,01/11] avcodec: add avcodec_get_supported_config() | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Niklas Haas April 5, 2024, 6:57 p.m. UTC 
From: Niklas Haas <git@haasn.dev>

All hail get_supported_config()
---
 libavcodec/allcodecs.c      | 7 +------
 libavcodec/codec_internal.h | 8 --------
 2 files changed, 1 insertion(+), 14 deletions(-)
diff mbox series

Patch

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 {