[FFmpeg-devel] [PATCH v4 09/17] avcodec/codec_internal: nuke init_static_data()

[Niklas Haas]

From: Niklas Haas <git at haasn.dev>

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 0d61b665af..d773ac36c2 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -915,13 +915,8 @@ static void av_codec_init_static(void)
 {
     int dummy;
     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 5863760564..5b2db74590 100644
--- a/libavcodec/codec_internal.h
+++ b/libavcodec/codec_internal.h
@@ -173,14 +173,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 {
-- 
2.46.0