diff --git a/tools/enum_options.c b/tools/enum_options.c
index 77e1f9f799..28631d1a6b 100644
--- a/tools/enum_options.c
+++ b/tools/enum_options.c
@@ -88,20 +88,22 @@ static void show_opts(const AVClass *class)
 
 static void show_format_opts(void)
 {
-    AVInputFormat *iformat = NULL;
-    AVOutputFormat *oformat = NULL;
+    const AVInputFormat *iformat = NULL;
+    const AVOutputFormat *oformat = NULL;
+    void *iformat_opaque = NULL;
+    void *oformat_opaque = NULL;
 
     printf("@section Generic format AVOptions\n");
     show_opts(avformat_get_class());
 
     printf("@section Format-specific AVOptions\n");
-    while ((iformat = av_iformat_next(iformat))) {
+    while ((iformat = av_demuxer_iterate(&iformat_opaque))) {
         if (!iformat->priv_class)
             continue;
         printf("@subsection %s AVOptions\n", iformat->priv_class->class_name);
         show_opts(iformat->priv_class);
     }
-    while ((oformat = av_oformat_next(oformat))) {
+    while ((oformat = av_muxer_iterate(&oformat_opaque))) {
         if (!oformat->priv_class)
             continue;
         printf("@subsection %s AVOptions\n", oformat->priv_class->class_name);