highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavc: remove disabled FF_API_AVCODEC_INIT cruft.

Browse Source
This commit is contained in:
Anton Khirnov 2012-01-22 10:56:42 +01:00
parent 491f443e1f
commit 3211932c51
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/avcodec.h
View File

@ -3429,15 +3429,6 @@ const char *avcodec_configuration(void);
*/ */
const char *avcodec_license(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. * Register the codec codec and initialize libavcodec.
* *

5
libavcodec/utils.c
View File

@ -88,10 +88,7 @@ AVCodec *av_codec_next(AVCodec *c){
else return first_avcodec; else return first_avcodec;
} }
#if !FF_API_AVCODEC_INIT static void avcodec_init(void)
static
#endif
void avcodec_init(void)
{ {
static int initialized = 0; static int initialized = 0;

3
libavcodec/version.h
View File

@ -41,9 +41,6 @@
#ifndef FF_API_REQUEST_CHANNELS #ifndef FF_API_REQUEST_CHANNELS
#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55) #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
#endif #endif
#ifndef FF_API_AVCODEC_INIT
#define FF_API_AVCODEC_INIT (LIBAVCODEC_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_LAME_GLOBAL_OPTS #ifndef FF_API_LAME_GLOBAL_OPTS
#define FF_API_LAME_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54) #define FF_API_LAME_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54)
#endif #endif