aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-08-10 09:50:00 +0200
committerAnton Khirnov <anton@khirnov.net>2011-08-10 12:49:57 +0200
commit7221139ba0486c24afeac1f41ba97c75f58046b9 (patch)
tree80cd8ebf69f529cff4308ae09b742a1e19957ff6 /libavcodec/avcodec.h
parentd1d33e0763d68c6eaff1342247f8c3198a188f0a (diff)
downloadffmpeg-7221139ba0486c24afeac1f41ba97c75f58046b9.tar.gz
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.
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 74a60ae89a..702e775d9d 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -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);