summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2021-04-18 12:41:52 -0300
committerJames Almer <jamrial@gmail.com>2021-04-27 11:48:04 -0300
commit0bf3a7361d17d596a5044882098f56817db0e103 (patch)
tree8d4818cc5a5cb02df18b91ffaea567b7e3099666 /libavcodec
parent3749eede66c3774799766b1f246afae8a6ffc9bb (diff)
downloadffmpeg-0bf3a7361d17d596a5044882098f56817db0e103.tar.gz
avutil: remove deprecated AVClass.child_class_next
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/bitstream_filters.c22
-rw-r--r--libavcodec/bsf.c3
-rw-r--r--libavcodec/bsf_internal.h4
-rw-r--r--libavcodec/options.c22
4 files changed, 0 insertions, 51 deletions
diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c
index 3de2af92d3..e03326515b 100644
--- a/libavcodec/bitstream_filters.c
+++ b/libavcodec/bitstream_filters.c
@@ -91,28 +91,6 @@ const AVBitStreamFilter *av_bsf_get_by_name(const char *name)
return NULL;
}
-#if FF_API_CHILD_CLASS_NEXT
-const AVClass *ff_bsf_child_class_next(const AVClass *prev)
-{
- const AVBitStreamFilter *f = NULL;
- void *i = 0;
-
- /* find the filter that corresponds to prev */
- while (prev && (f = av_bsf_iterate(&i))) {
- if (f->priv_class == prev) {
- break;
- }
- }
-
- /* find next filter with priv options */
- while ((f = av_bsf_iterate(&i))) {
- if (f->priv_class)
- return f->priv_class;
- }
- return NULL;
-}
-#endif
-
const AVClass *ff_bsf_child_class_iterate(void **opaque)
{
const AVBitStreamFilter *f;
diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c
index 543fe87b30..9d67ea5395 100644
--- a/libavcodec/bsf.c
+++ b/libavcodec/bsf.c
@@ -80,9 +80,6 @@ static const AVClass bsf_class = {
.item_name = bsf_to_name,
.version = LIBAVUTIL_VERSION_INT,
.child_next = bsf_child_next,
-#if FF_API_CHILD_CLASS_NEXT
- .child_class_next = ff_bsf_child_class_next,
-#endif
.child_class_iterate = ff_bsf_child_class_iterate,
.category = AV_CLASS_CATEGORY_BITSTREAM_FILTER,
};
diff --git a/libavcodec/bsf_internal.h b/libavcodec/bsf_internal.h
index b78c134bdd..06979fdaa3 100644
--- a/libavcodec/bsf_internal.h
+++ b/libavcodec/bsf_internal.h
@@ -42,10 +42,6 @@ int ff_bsf_get_packet(AVBSFContext *ctx, AVPacket **pkt);
*/
int ff_bsf_get_packet_ref(AVBSFContext *ctx, AVPacket *pkt);
-#if FF_API_CHILD_CLASS_NEXT
-const AVClass *ff_bsf_child_class_next(const AVClass *prev);
-#endif
-
const AVClass *ff_bsf_child_class_iterate(void **opaque);
#endif /* AVCODEC_BSF_INTERNAL_H */
diff --git a/libavcodec/options.c b/libavcodec/options.c
index 369110b8d0..bba6078b62 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -53,25 +53,6 @@ static void *codec_child_next(void *obj, void *prev)
return NULL;
}
-#if FF_API_CHILD_CLASS_NEXT
-static const AVClass *codec_child_class_next(const AVClass *prev)
-{
- void *iter = NULL;
- const AVCodec *c = NULL;
-
- /* find the codec that corresponds to prev */
- while (prev && (c = av_codec_iterate(&iter)))
- if (c->priv_class == prev)
- break;
-
- /* find next codec with priv options */
- while (c = av_codec_iterate(&iter))
- if (c->priv_class)
- return c->priv_class;
- return NULL;
-}
-#endif
-
static const AVClass *codec_child_class_iterate(void **iter)
{
const AVCodec *c;
@@ -96,9 +77,6 @@ static const AVClass av_codec_context_class = {
.version = LIBAVUTIL_VERSION_INT,
.log_level_offset_offset = offsetof(AVCodecContext, log_level_offset),
.child_next = codec_child_next,
-#if FF_API_CHILD_CLASS_NEXT
- .child_class_next = codec_child_class_next,
-#endif
.child_class_iterate = codec_child_class_iterate,
.category = AV_CLASS_CATEGORY_ENCODER,
.get_category = get_category,