diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-22 10:56:42 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 10:38:34 +0100 |
| commit | 3211932c513338566b31d990d06957e15a644d13 (patch) | |
| tree | cbd6739ea3b152061e89a11bbfc0b586f626bfb2 | |
| parent | 491f443e1f7ebcc8bf8be434ad7c383f5647aff9 (diff) | |
| download | ffmpeg-3211932c513338566b31d990d06957e15a644d13.tar.gz | |
lavc: remove disabled FF_API_AVCODEC_INIT cruft.
| -rw-r--r-- | libavcodec/avcodec.h | 9 | ||||
| -rw-r--r-- | libavcodec/utils.c | 5 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 1 insertions, 16 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index fa9dba7277..d724ea1b2c 100644 --- 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 7c0f18aa34..fadfb0c0aa 100644 --- 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 e19de49d16..4a7a07ba34 100644 --- 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 |