demux: Move demuxer help to new standard mechanism

Previously, demux help was handled as a special case in main.c and this
is no longer necessary.

2 files changed, 5 insertions, 2 deletions

diff --git a/demux/demux.c b/demux/demux.c
index 348d665d49..5fa0528d3d 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -2827,7 +2827,7 @@ done:
     return out_pkt;
 }
 
-void demuxer_help(struct mp_log *log)
+int demuxer_help(struct mp_log *log, const m_option_t *opt, struct bstr name)
 {
     int i;
 
@@ -2837,6 +2837,9 @@ void demuxer_help(struct mp_log *log)
         mp_info(log, "%10s  %s\n",
                 demuxer_list[i]->name, demuxer_list[i]->desc);
     }
+    mp_info(log, "\n");
+
+    return M_OPT_EXIT;
 }
 
 static const char *d_level(enum demux_check level)
diff --git a/demux/demux.h b/demux/demux.h
index 80c9a80fc7..ed414f1816 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -293,7 +293,7 @@ void demuxer_select_track(struct demuxer *demuxer, struct sh_stream *stream,
 void demuxer_refresh_track(struct demuxer *demuxer, struct sh_stream *stream,
                            double ref_pts);
 
-void demuxer_help(struct mp_log *log);
+int demuxer_help(struct mp_log *log, const m_option_t *opt, struct bstr name);
 
 int demuxer_add_attachment(struct demuxer *demuxer, char *name,
                            char *type, void *data, size_t data_size);