diff options
author | James Almer <jamrial@gmail.com> | 2021-04-18 12:41:52 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2021-04-27 11:48:04 -0300 |
commit | 0bf3a7361d17d596a5044882098f56817db0e103 (patch) | |
tree | 8d4818cc5a5cb02df18b91ffaea567b7e3099666 /libavutil | |
parent | 3749eede66c3774799766b1f246afae8a6ffc9bb (diff) |
avutil: remove deprecated AVClass.child_class_next
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/log.h | 13 | ||||
-rw-r--r-- | libavutil/opt.c | 19 | ||||
-rw-r--r-- | libavutil/opt.h | 13 | ||||
-rw-r--r-- | libavutil/version.h | 3 |
4 files changed, 0 insertions, 48 deletions
diff --git a/libavutil/log.h b/libavutil/log.h index 8edd6bbf2b..c2f1232a16 100644 --- a/libavutil/log.h +++ b/libavutil/log.h @@ -112,19 +112,6 @@ typedef struct AVClass { */ void* (*child_next)(void *obj, void *prev); -#if FF_API_CHILD_CLASS_NEXT - /** - * Return an AVClass corresponding to the next potential - * AVOptions-enabled child. - * - * The difference between child_next and this is that - * child_next iterates over _already existing_ objects, while - * child_class_next iterates over _all possible_ children. - */ - attribute_deprecated - const struct AVClass* (*child_class_next)(const struct AVClass *prev); -#endif - /** * Category used for visualization (like color) * This is only set if the category is equal for all objects using this class. diff --git a/libavutil/opt.c b/libavutil/opt.c index 590146b5fb..4124efd9b6 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1717,29 +1717,10 @@ void *av_opt_child_next(void *obj, void *prev) return NULL; } -#if FF_API_CHILD_CLASS_NEXT -FF_DISABLE_DEPRECATION_WARNINGS -const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *prev) -{ - if (parent->child_class_next) - return parent->child_class_next(prev); - return NULL; -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif - const AVClass *av_opt_child_class_iterate(const AVClass *parent, void **iter) { if (parent->child_class_iterate) return parent->child_class_iterate(iter); -#if FF_API_CHILD_CLASS_NEXT -FF_DISABLE_DEPRECATION_WARNINGS - if (parent->child_class_next) { - *iter = parent->child_class_next(*iter); - return *iter; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif return NULL; } diff --git a/libavutil/opt.h b/libavutil/opt.h index 8dc020a820..c2329e5589 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -648,19 +648,6 @@ const AVOption *av_opt_next(const void *obj, const AVOption *prev); */ void *av_opt_child_next(void *obj, void *prev); -#if FF_API_CHILD_CLASS_NEXT -/** - * Iterate over potential AVOptions-enabled children of parent. - * - * @param prev result of a previous call to this function or NULL - * @return AVClass corresponding to next potential child or NULL - * - * @deprecated use av_opt_child_class_iterate - */ -attribute_deprecated -const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *prev); -#endif - /** * Iterate over potential AVOptions-enabled children of parent. * diff --git a/libavutil/version.h b/libavutil/version.h index bba86c599e..aa9a3244c4 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,9 +105,6 @@ * @{ */ -#ifndef FF_API_CHILD_CLASS_NEXT -#define FF_API_CHILD_CLASS_NEXT (LIBAVUTIL_VERSION_MAJOR < 57) -#endif #ifndef FF_API_D2STR #define FF_API_D2STR (LIBAVUTIL_VERSION_MAJOR < 58) #endif |