RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-19 01:47:38 +00:00
Code Issues Releases Wiki Activity

charset_conv: remove ancient warning about deprecated syntax

Browse Source 
wm4 removed this in 4adfde5dd1 and left a
warning. Nobody needs to know that enca:pl used to work.
This commit is contained in:
Dudemanguy 2023-10-01 12:12:33 -05:00
parent e22efe2d22
commit a96dd2f5e7
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DOCS/man/options.rst
View File

@ -2629,9 +2629,6 @@ Subtitles
subtitles are interpreted as UTF-8 with "Latin 1" as fallback for bytes 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. 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:: .. note::
This works for text subtitle files only. Other types of subtitles (in This works for text subtitle files only. Other types of subtitles (in

12
misc/charset_conv.c
View File

@ -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 *mp_charset_guess(void *talloc_ctx, struct mp_log *log, bstr buf,
const char *user_cp, int flags) 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] == '+') { if (user_cp[0] == '+') {
mp_verbose(log, "Forcing charset '%s'.\n", user_cp + 1); mp_verbose(log, "Forcing charset '%s'.\n", user_cp + 1);
return user_cp + 1; return user_cp + 1;