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 /libavformat | |
parent | 3749eede66c3774799766b1f246afae8a6ffc9bb (diff) |
avutil: remove deprecated AVClass.child_class_next
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/avio.c | 3 | ||||
-rw-r--r-- | libavformat/aviobuf.c | 10 | ||||
-rw-r--r-- | libavformat/options.c | 38 | ||||
-rw-r--r-- | libavformat/protocols.c | 21 | ||||
-rw-r--r-- | libavformat/url.h | 4 |
5 files changed, 0 insertions, 76 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c index 8011482e76..2974f4b2b4 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -67,9 +67,6 @@ const AVClass ffurl_context_class = { .option = options, .version = LIBAVUTIL_VERSION_INT, .child_next = urlcontext_child_next, -#if FF_API_CHILD_CLASS_NEXT - .child_class_next = ff_urlcontext_child_class_next, -#endif .child_class_iterate = ff_urlcontext_child_class_iterate, }; /*@}*/ diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 1ecc7fb095..ddfa4ecbf1 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -48,13 +48,6 @@ static void *ff_avio_child_next(void *obj, void *prev) return prev ? NULL : s->opaque; } -#if FF_API_CHILD_CLASS_NEXT -static const AVClass *ff_avio_child_class_next(const AVClass *prev) -{ - return prev ? NULL : &ffurl_context_class; -} -#endif - static const AVClass *child_class_iterate(void **iter) { const AVClass *c = *iter ? NULL : &ffurl_context_class; @@ -76,9 +69,6 @@ const AVClass ff_avio_class = { .version = LIBAVUTIL_VERSION_INT, .option = ff_avio_options, .child_next = ff_avio_child_next, -#if FF_API_CHILD_CLASS_NEXT - .child_class_next = ff_avio_child_class_next, -#endif .child_class_iterate = child_class_iterate, }; diff --git a/libavformat/options.c b/libavformat/options.c index 632d450c90..dccb6faa73 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -54,41 +54,6 @@ static void *format_child_next(void *obj, void *prev) return NULL; } -#if FF_API_CHILD_CLASS_NEXT -static const AVClass *format_child_class_next(const AVClass *prev) -{ - const AVInputFormat *ifmt = NULL; - const AVOutputFormat *ofmt = NULL; - void *ifmt_iter = NULL, *ofmt_iter = NULL; - - if (!prev) - return &ff_avio_class; - - while ((ifmt = av_demuxer_iterate(&ifmt_iter))) - if (ifmt->priv_class == prev) - break; - - if (!ifmt) { - ifmt_iter = NULL; - while ((ofmt = av_muxer_iterate(&ofmt_iter))) - if (ofmt->priv_class == prev) - break; - } - if (!ofmt) { - ofmt_iter = NULL; - while ((ifmt = av_demuxer_iterate(&ifmt_iter))) - if (ifmt->priv_class) - return ifmt->priv_class; - } - - while ((ofmt = av_muxer_iterate(&ofmt_iter))) - if (ofmt->priv_class) - return ofmt->priv_class; - - return NULL; -} -#endif - enum { CHILD_CLASS_ITER_AVIO = 0, CHILD_CLASS_ITER_MUX, @@ -158,9 +123,6 @@ static const AVClass av_format_context_class = { .option = avformat_options, .version = LIBAVUTIL_VERSION_INT, .child_next = format_child_next, -#if FF_API_CHILD_CLASS_NEXT - .child_class_next = format_child_class_next, -#endif .child_class_iterate = format_child_class_iterate, .category = AV_CLASS_CATEGORY_MUXER, .get_category = get_category, diff --git a/libavformat/protocols.c b/libavformat/protocols.c index fb6fabdce5..4b6b1c8e98 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -75,27 +75,6 @@ extern const URLProtocol ff_libzmq_protocol; #include "libavformat/protocol_list.c" -#if FF_API_CHILD_CLASS_NEXT -const AVClass *ff_urlcontext_child_class_next(const AVClass *prev) -{ - int i; - - /* find the protocol that corresponds to prev */ - for (i = 0; prev && url_protocols[i]; i++) { - if (url_protocols[i]->priv_data_class == prev) { - i++; - break; - } - } - - /* find next protocol with priv options */ - for (; url_protocols[i]; i++) - if (url_protocols[i]->priv_data_class) - return url_protocols[i]->priv_data_class; - return NULL; -} -#endif - const AVClass *ff_urlcontext_child_class_iterate(void **iter) { const AVClass *ret = NULL; diff --git a/libavformat/url.h b/libavformat/url.h index 3bb1cf89f7..40e6c1d17c 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -329,10 +329,6 @@ int ff_make_absolute_url(char *buf, int size, const char *base, */ AVIODirEntry *ff_alloc_dir_entry(void); -#if FF_API_CHILD_CLASS_NEXT -const AVClass *ff_urlcontext_child_class_next(const AVClass *prev); -#endif - const AVClass *ff_urlcontext_child_class_iterate(void **iter); /** |