diff options
| -rw-r--r-- | DOCS/interface-changes.rst | 2 | ||||
| -rw-r--r-- | DOCS/man/options.rst | 5 | ||||
| -rw-r--r-- | options/options.c | 3 | ||||
| -rw-r--r-- | player/loadfile.c | 9 |
4 files changed, 5 insertions, 14 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 538439ec28..8d34fcf99e 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -43,6 +43,8 @@ Interface changes - add `--libplacebo-opts` option - change `--video-pan-x/y` to be relative to the destination rectangle - add `--audio-file-exts`, `--cover-art-auto-exts`, and `--sub-auto-exts` + - change `slang` default back to NULL + - remove special handling of the `auto` value from `--alang/slang/vlang` options --- mpv 0.36.0 --- - add `--target-contrast` - Target luminance value is now also applied when ICC profile is used. diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 23692a672f..94d7bce6e8 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -11,9 +11,6 @@ Track Selection A track that matches more subtags will be preferred over one that matches fewer, with preference given to earlier subtags over later ones. See also ``--aid``. - The special value "auto" can be included anywhere in the list, - and is equivalent to the user's OS-level list of preferred languages. - This is a string list option. See `List Options`_ for details. .. admonition:: Examples @@ -24,7 +21,7 @@ Track Selection audio. ``--slang=<languagecode[,languagecode,...]>`` - Equivalent to ``--alang``, for subtitle tracks (default: auto). + Equivalent to ``--alang``, for subtitle tracks. This is a string list option. See `List Options`_ for details. diff --git a/options/options.c b/options/options.c index 7b9156a823..13fefd5f0d 100644 --- a/options/options.c +++ b/options/options.c @@ -1042,9 +1042,6 @@ static const struct MPOpts mp_default_opts = { { [STREAM_AUDIO] = -2, [STREAM_VIDEO] = -2, [STREAM_SUB] = -2, }, }, - .stream_lang = { - [STREAM_SUB] = (char *[]){ "auto", NULL }, - }, .stream_auto_sel = true, .subs_with_matching_audio = true, .subs_fallback = 1, diff --git a/player/loadfile.c b/player/loadfile.c index 84cef94639..a64a0733df 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -568,13 +568,8 @@ static char **process_langs(char **in) size_t nb = 0; char **out = NULL; for (int i = 0; in && in[i]; i++) { - if (!strcmp(in[i], "auto")) { - if (!add_auto_langs(&nb, &out)) - break; - } else { - if (!append_lang(&nb, &out, talloc_strdup(NULL, in[i]))) - break; - } + if (!append_lang(&nb, &out, talloc_strdup(NULL, in[i]))) + break; } return out; } |