diff options
| author | Dudemanguy <random342@airmail.cc> | 2023-10-01 12:12:33 -0500 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-10-07 02:41:27 +0000 |
| commit | a96dd2f5e76c69859caa7b6e34b2fd9fd9e89672 (patch) | |
| tree | 15d8f87d315235ee80ccc1f76a7a7450e6d9f5ce | |
| parent | e22efe2d221ec668cb362c6ce4e4ebb974bf1ce7 (diff) | |
| download | mpv-a96dd2f5e76c69859caa7b6e34b2fd9fd9e89672.tar.bz2 mpv-a96dd2f5e76c69859caa7b6e34b2fd9fd9e89672.tar.xz | |
charset_conv: remove ancient warning about deprecated syntax
wm4 removed this in 4adfde5dd1e67775228a345cea00ea03ba6bc68f and left a
warning. Nobody needs to know that enca:pl used to work.
| -rw-r--r-- | DOCS/man/options.rst | 3 | ||||
| -rw-r--r-- | misc/charset_conv.c | 12 |
2 files changed, 0 insertions, 15 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 25ad0f4a67..8d9ae79c38 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -2629,9 +2629,6 @@ Subtitles subtitles are interpreted as UTF-8 with "Latin 1" as fallback for bytes which are not valid UTF-8 sequences. iconv is never involved in this mode. - This option changed in mpv 0.23.0. Support for the old syntax was fully - removed in mpv 0.24.0. - .. note:: This works for text subtitle files only. Other types of subtitles (in diff --git a/misc/charset_conv.c b/misc/charset_conv.c index cbd1c70afb..f649057fe8 100644 --- a/misc/charset_conv.c +++ b/misc/charset_conv.c @@ -101,18 +101,6 @@ static const char *mp_uchardet(void *talloc_ctx, struct mp_log *log, bstr buf) const char *mp_charset_guess(void *talloc_ctx, struct mp_log *log, bstr buf, const char *user_cp, int flags) { - if (strcasecmp(user_cp, "enca") == 0 || strcasecmp(user_cp, "guess") == 0 || - strcasecmp(user_cp, "uchardet") == 0 || strchr(user_cp, ':')) - { - mp_err(log, "This syntax for the --sub-codepage option was deprecated " - "and has been removed.\n"); - if (strncasecmp(user_cp, "utf8:", 5) == 0) { - user_cp = user_cp + 5; - } else { - user_cp = ""; - } - } - if (user_cp[0] == '+') { mp_verbose(log, "Forcing charset '%s'.\n", user_cp + 1); return user_cp + 1; |