From ae1aeab7aa2b7c378a9f734d227121f84ae85ed2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 1 Mar 2020 00:28:09 +0100 Subject: options: make decoder options local to decoder wrapper Instead of having f_decoder_wrapper create its own copy of the entire mpv option tree, create a struct local to that file and move all used options to there. movie_aspect is used by the "video-aspect" deprecated property code. I think it's probably better not to remove the property yet, but fortunately it's easy to work around without needing special handling for this option or so. correct_pts is used to prevent use of hr-seek in playloop.c. Ignore that, if you use --no-correct-pts you're asking for trouble anyway. This is the only behavior change. --- player/main.c | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'player/main.c') diff --git a/player/main.c b/player/main.c index 6cb56ef601..9dbd160a70 100644 --- a/player/main.c +++ b/player/main.c @@ -201,22 +201,6 @@ static bool handle_help_options(struct MPContext *mpctx) { struct MPOpts *opts = mpctx->opts; struct mp_log *log = mpctx->log; - if (opts->audio_decoders && strcmp(opts->audio_decoders, "help") == 0) { - struct mp_decoder_list *list = audio_decoder_list(); - mp_print_decoders(log, MSGL_INFO, "Audio decoders:", list); - talloc_free(list); - return true; - } - if (opts->audio_spdif && strcmp(opts->audio_spdif, "help") == 0) { - MP_INFO(mpctx, "Choices: ac3,dts-hd,dts (and possibly more)\n"); - return true; - } - if (opts->video_decoders && strcmp(opts->video_decoders, "help") == 0) { - struct mp_decoder_list *list = video_decoder_list(); - mp_print_decoders(log, MSGL_INFO, "Video decoders:", list); - talloc_free(list); - return true; - } if ((opts->demuxer_name && strcmp(opts->demuxer_name, "help") == 0) || (opts->audio_demuxer_name && strcmp(opts->audio_demuxer_name, "help") == 0) || (opts->sub_demuxer_name && strcmp(opts->sub_demuxer_name, "help") == 0)) { -- cgit v1.2.3