loadfile: fix --no-subs-with-matching-audio with --slang
If --slang was set to some language and it matched the subtitle track,
then --no-subs-with-matching-audio would do nothing. Fix the logic by
doing the --no-subs-with-matching-audio step at the end to ensure that
it always "wins" over whatever --slang or --subs-fallback has set.
Clarify the docs a bit to make it clearer that this is the intended
behavior. Fixes fbe8f99194.
This commit is contained in:
1 parent
92fe8f1a4e
commit
df613cef4c
2 files changed
+7
-3
No files matched your search
+4
-2
@@ -663,8 +663,10 @@ struct track *select_default_track(struct MPContext *mpctx, int order,
|
||||
sub_fallback = (pick->is_external && !pick->no_default) || opts->subs_fallback == 2 ||
|
||||
(opts->subs_fallback == 1 && pick->default_track);
|
||||
}
|
||||
if (pick && !forced_pick && sub && (!match_lang(langs, pick->lang) || os_langs) &&
|
||||
((!opts->subs_with_matching_audio && audio_matches) || !sub_fallback))
|
||||
if (pick && !forced_pick && sub && (!match_lang(langs, pick->lang) || os_langs) && !sub_fallback)
|
||||
pick = NULL;
|
||||
// Handle this after matching langs and selecting a fallback.
|
||||
if (pick && !forced_pick && sub && (!opts->subs_with_matching_audio && audio_matches))
|
||||
pick = NULL;
|
||||
|
||||
if (pick && pick->attached_picture && !mpctx->opts->audio_display)
|
||||
|
||||
Reference in new issue
Block a user