lavc: remove disabled FF_API_AVCODEC_INIT cruft.

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index fa9dba7..d724ea1 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3429,15 +3429,6 @@ const char *avcodec_configuration(void);
  */
 const char *avcodec_license(void);
 
-#if FF_API_AVCODEC_INIT
-/**
- * @deprecated this function is called automatically from avcodec_register()
- * and avcodec_register_all(), there is no need to call it manually
- */
-attribute_deprecated
-void avcodec_init(void);
-#endif
-
 /**
  * Register the codec codec and initialize libavcodec.
  *

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 7c0f18a..fadfb0c 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -88,10 +88,7 @@ AVCodec *av_codec_next(AVCodec *c){
     else  return first_avcodec;
 }
 
-#if !FF_API_AVCODEC_INIT
-static
-#endif
-void avcodec_init(void)
+static void avcodec_init(void)
 {
     static int initialized = 0;
 

diff --git a/libavcodec/version.h b/libavcodec/version.h
index e19de49..4a7a07b 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_AVCODEC_INIT
-#define FF_API_AVCODEC_INIT     (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
 #ifndef FF_API_LAME_GLOBAL_OPTS
 #define FF_API_LAME_GLOBAL_OPTS  (LIBAVCODEC_VERSION_MAJOR < 54)
 #endif