lavc: remove disabled FF_API_THREAD_INIT cruft.

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 38df95f6b336c4cac8e0eb5099d7ffd89b4da394..778b3286748809d859e196e9641cc08585d91e53 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3726,14 +3726,6 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
 
 enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt);
 
-#if FF_API_THREAD_INIT
-/**
- * @deprecated Set s->thread_count before calling avcodec_open2() instead of calling this.
- */
-attribute_deprecated
-int avcodec_thread_init(AVCodecContext *s, int thread_count);
-#endif
-
 int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size);
 int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count);
 //FIXME func typedef

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index bcdb71a474ef30f00a55537a8e025e5f2a7b7ff8..7f8009d7f9e6c71a072d6fdfeb78256a40454294 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1810,14 +1810,6 @@ void ff_thread_await_progress(AVFrame *f, int progress, int field)
 
 #endif
 
-#if FF_API_THREAD_INIT
-int avcodec_thread_init(AVCodecContext *s, int thread_count)
-{
-    s->thread_count = thread_count;
-    return ff_thread_init(s);
-}
-#endif
-
 enum AVMediaType avcodec_get_type(enum CodecID codec_id)
 {
     if (codec_id <= CODEC_ID_NONE)

diff --git a/libavcodec/version.h b/libavcodec/version.h
index 77c512ce17d1c45485377b04bd68992212055c9a..7b2bd188de18ec53b27e6b8474f1d6a3c3cf116f 100644 (file)
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -41,9 +41,6 @@
 #ifndef FF_API_REQUEST_CHANNELS
 #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
 #endif
-#ifndef FF_API_THREAD_INIT
-#define FF_API_THREAD_INIT      (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
 #ifndef FF_API_OLD_FF_PICT_TYPES
 #define FF_API_OLD_FF_PICT_TYPES (LIBAVCODEC_VERSION_MAJOR < 54)
 #endif