From c8f474e3e5005373796f2a9fea77aa57ffcd7637 Mon Sep 17 00:00:00 2001 From: Philip Langdale Date: Sat, 6 Mar 2021 16:08:17 -0800 Subject: 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. --- options/options.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'options') diff --git a/options/options.c b/options/options.c index 8aadc87ab9..2a168da4e5 100644 --- a/options/options.c +++ b/options/options.c @@ -46,6 +46,7 @@ #include "player/core.h" #include "player/command.h" #include "stream/stream.h" +#include "demux/demux.h" #if HAVE_DRM #include "video/out/drm_common.h" @@ -514,9 +515,9 @@ static const m_option_t mp_opts[] = { #endif // demuxer.c - select audio/sub file/demuxer - {"demuxer", OPT_STRING(demuxer_name)}, - {"audio-demuxer", OPT_STRING(audio_demuxer_name)}, - {"sub-demuxer", OPT_STRING(sub_demuxer_name)}, + {"demuxer", OPT_STRING(demuxer_name), .help = demuxer_help}, + {"audio-demuxer", OPT_STRING(audio_demuxer_name), .help = demuxer_help}, + {"sub-demuxer", OPT_STRING(sub_demuxer_name), .help = demuxer_help}, {"demuxer-thread", OPT_FLAG(demuxer_thread)}, {"demuxer-termination-timeout", OPT_DOUBLE(demux_termination_timeout)}, {"demuxer-cache-wait", OPT_FLAG(demuxer_cache_wait)}, -- cgit v1.2.3