lavc: make avcodec_init() static on next bump.
It's called from avcodec_register() anyway, so there's no reason for it to be public.
This commit is contained in:
parent
d1d33e0763
commit
7221139ba0
@ -3482,21 +3482,22 @@ const char *avcodec_configuration(void);
|
||||
*/
|
||||
const char *avcodec_license(void);
|
||||
|
||||
#if FF_API_AVCODEC_INIT
|
||||
/**
|
||||
* Initialize libavcodec.
|
||||
* If called more than once, does nothing.
|
||||
*
|
||||
* @warning This function must be called before any other libavcodec
|
||||
* function.
|
||||
*
|
||||
* @warning This function is not thread-safe.
|
||||
* @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.
|
||||
*
|
||||
* @see avcodec_init(), avcodec_register_all()
|
||||
* @warning either this function or avcodec_register_all() must be called
|
||||
* before any other libavcodec functions.
|
||||
*
|
||||
* @see avcodec_register_all()
|
||||
*/
|
||||
void avcodec_register(AVCodec *codec);
|
||||
|
||||
|
@ -1065,6 +1065,9 @@ const char *avcodec_license(void)
|
||||
return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
|
||||
}
|
||||
|
||||
#if !FF_API_AVCODEC_INIT
|
||||
static
|
||||
#endif
|
||||
void avcodec_init(void)
|
||||
{
|
||||
static int initialized = 0;
|
||||
|
@ -80,5 +80,8 @@
|
||||
#ifndef FF_API_VERY_AGGRESSIVE
|
||||
#define FF_API_VERY_AGGRESSIVE (LIBAVCODEC_VERSION_MAJOR < 54)
|
||||
#endif
|
||||
#ifndef FF_API_AVCODEC_INIT
|
||||
#define FF_API_AVCODEC_INIT (LIBAVCODEC_VERSION_MAJOR < 54)
|
||||
#endif
|
||||
|
||||
#endif /* AVCODEC_VERSION_H */
|
||||
|
Loading…
Reference in New Issue
Block a user