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 /libavfilter | |
parent | 3749eede66c3774799766b1f246afae8a6ffc9bb (diff) |
avutil: remove deprecated AVClass.child_class_next
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/af_aresample.c | 10 | ||||
-rw-r--r-- | libavfilter/avfilter.c | 27 | ||||
-rw-r--r-- | libavfilter/framesync.h | 4 | ||||
-rw-r--r-- | libavfilter/vf_scale.c | 13 | ||||
-rw-r--r-- | libavfilter/vf_spp.c | 10 |
5 files changed, 0 insertions, 64 deletions
diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c index e54bd3eb41..f8e03061a5 100644 --- a/libavfilter/af_aresample.c +++ b/libavfilter/af_aresample.c @@ -293,13 +293,6 @@ static int request_frame(AVFilterLink *outlink) return ret; } -#if FF_API_CHILD_CLASS_NEXT -static const AVClass *resample_child_class_next(const AVClass *prev) -{ - return prev ? NULL : swr_get_class(); -} -#endif - static const AVClass *resample_child_class_iterate(void **iter) { const AVClass *c = *iter ? NULL : swr_get_class(); @@ -326,9 +319,6 @@ static const AVClass aresample_class = { .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, -#if FF_API_CHILD_CLASS_NEXT - .child_class_next = resample_child_class_next, -#endif .child_class_iterate = resample_child_class_iterate, .child_next = resample_child_next, }; diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 6e12c8fa05..c04afc6639 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -571,30 +571,6 @@ static void *filter_child_next(void *obj, void *prev) return NULL; } -#if FF_API_CHILD_CLASS_NEXT -static const AVClass *filter_child_class_next(const AVClass *prev) -{ - void *opaque = NULL; - const AVFilter *f = NULL; - - /* find the filter that corresponds to prev */ - while (prev && (f = av_filter_iterate(&opaque))) - if (f->priv_class == prev) - break; - - /* could not find filter corresponding to prev */ - if (prev && !f) - return NULL; - - /* find next filter with specific options */ - while ((f = av_filter_iterate(&opaque))) - if (f->priv_class) - return f->priv_class; - - return NULL; -} -#endif - static const AVClass *filter_child_class_iterate(void **iter) { const AVFilter *f; @@ -627,9 +603,6 @@ static const AVClass avfilter_class = { .version = LIBAVUTIL_VERSION_INT, .category = AV_CLASS_CATEGORY_FILTER, .child_next = filter_child_next, -#if FF_API_CHILD_CLASS_NEXT - .child_class_next = filter_child_class_next, -#endif .child_class_iterate = filter_child_class_iterate, .option = avfilter_options, }; diff --git a/libavfilter/framesync.h b/libavfilter/framesync.h index 51bab16285..fb85e8aec7 100644 --- a/libavfilter/framesync.h +++ b/libavfilter/framesync.h @@ -305,9 +305,6 @@ static int name##_framesync_preinit(AVFilterContext *ctx) { \ ff_framesync_preinit(&s->field); \ return 0; \ } \ -static const AVClass *name##_child_class_next(const AVClass *prev) { \ - return prev ? NULL : ff_framesync_get_class(); \ -} \ static void *name##_child_next(void *obj, void *prev) { \ context *s = obj; \ s->fs.class = ff_framesync_get_class(); /* FIXME */ \ @@ -319,7 +316,6 @@ static const AVClass name##_class = { \ .option = name##_options, \ .version = LIBAVUTIL_VERSION_INT, \ .category = AV_CLASS_CATEGORY_FILTER, \ - .child_class_next = name##_child_class_next, \ .child_class_iterate = ff_framesync_child_class_iterate, \ .child_next = name##_child_next, \ } diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 3add31bace..7f68a51913 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -879,13 +879,6 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar return ret; } -#if FF_API_CHILD_CLASS_NEXT -static const AVClass *child_class_next(const AVClass *prev) -{ - return prev ? NULL : sws_get_class(); -} -#endif - static const AVClass *child_class_iterate(void **iter) { const AVClass *c = *iter ? NULL : sws_get_class(); @@ -950,9 +943,6 @@ static const AVClass scale_class = { .option = scale_options, .version = LIBAVUTIL_VERSION_INT, .category = AV_CLASS_CATEGORY_FILTER, -#if FF_API_CHILD_CLASS_NEXT - .child_class_next = child_class_next, -#endif .child_class_iterate = child_class_iterate, }; @@ -993,9 +983,6 @@ static const AVClass scale2ref_class = { .option = scale_options, .version = LIBAVUTIL_VERSION_INT, .category = AV_CLASS_CATEGORY_FILTER, -#if FF_API_CHILD_CLASS_NEXT - .child_class_next = child_class_next, -#endif .child_class_iterate = child_class_iterate, }; diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c index 6ea7e7458f..c548d86d72 100644 --- a/libavfilter/vf_spp.c +++ b/libavfilter/vf_spp.c @@ -46,13 +46,6 @@ enum mode { NB_MODES }; -#if FF_API_CHILD_CLASS_NEXT -static const AVClass *child_class_next(const AVClass *prev) -{ - return prev ? NULL : avcodec_dct_get_class(); -} -#endif - static const AVClass *child_class_iterate(void **iter) { const AVClass *c = *iter ? NULL : avcodec_dct_get_class(); @@ -85,9 +78,6 @@ static const AVClass spp_class = { .option = spp_options, .version = LIBAVUTIL_VERSION_INT, .category = AV_CLASS_CATEGORY_FILTER, -#if FF_API_CHILD_CLASS_NEXT - .child_class_next = child_class_next, -#endif .child_class_iterate = child_class_iterate, .child_next = child_next, }; |