diff --git a/libavcodec/options.c b/libavcodec/options.c
index a08b7e5225..ed51146c16 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -73,6 +73,7 @@ static const AVClass av_codec_context_class = {
     .log_level_offset_offset = offsetof(AVCodecContext, log_level_offset),
     .child_next              = codec_child_next,
     .child_class_next        = codec_child_class_next,
+    .category                = AV_CLASS_CATEGORY_ENCODER,
 };
 
 #if FF_API_ALLOC_CONTEXT
diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
index c602f5ddce..35e7db880a 100644
--- a/libavfilter/af_aformat.c
+++ b/libavfilter/af_aformat.c
@@ -58,6 +58,7 @@ static const AVClass aformat_class = {
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
+    .category = AV_CLASS_CATEGORY_FILTER,
 };
 
 #define PARSE_FORMATS(str, type, list, add_to_list, get_fmt, none, desc)    \
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 38be0e613b..0c3e7edb11 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -376,6 +376,7 @@ static const AVClass avfilter_class = {
     .class_name = "AVFilter",
     .item_name  = filter_name,
     .version    = LIBAVUTIL_VERSION_INT,
+    .category = AV_CLASS_CATEGORY_FILTER,
 };
 
 int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name)
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c
index d4f74127e6..0c60caf942 100644
--- a/libavfilter/buffersrc.c
+++ b/libavfilter/buffersrc.c
@@ -258,6 +258,7 @@ static const AVClass abuffer_class = {
     .item_name  = av_default_item_name,
     .option     = audio_options,
     .version    = LIBAVUTIL_VERSION_INT,
+    .category   = AV_CLASS_CATEGORY_FILTER,
 };
 
 static av_cold int init_audio(AVFilterContext *ctx, const char *args, void *opaque)
diff --git a/libavformat/options.c b/libavformat/options.c
index c3056376d2..832d058dd0 100644
--- a/libavformat/options.c
+++ b/libavformat/options.c
@@ -83,6 +83,7 @@ static const AVClass av_format_context_class = {
     .version        = LIBAVUTIL_VERSION_INT,
     .child_next     = format_child_next,
     .child_class_next = format_child_class_next,
+    .category       = AV_CLASS_CATEGORY_MUXER,
 };
 
 static void avformat_get_context_defaults(AVFormatContext *s)