diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2015-12-11 18:33:38 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2015-12-11 18:33:38 +0100 |
| commit | 0607dcebff1bfd9e1be534a58916045c32284e8d (patch) | |
| tree | ebadce7def2db57813a90f4768e5f6ef7770e353 /misc/charset_conv.h | |
| parent | a33a44cf4e549ac8db4d703aaf51eb9aca00b6dc (diff) | |
| parent | 3d12312806e7d54e7bb6b4b2a5981999735f6233 (diff) | |
| download | mpv-0607dcebff1bfd9e1be534a58916045c32284e8d.tar.bz2 mpv-0607dcebff1bfd9e1be534a58916045c32284e8d.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'misc/charset_conv.h')
| -rw-r--r-- | misc/charset_conv.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/misc/charset_conv.h b/misc/charset_conv.h index bd76ae007a..3d3520fb2b 100644 --- a/misc/charset_conv.h +++ b/misc/charset_conv.h @@ -16,8 +16,6 @@ bool mp_charset_is_utf8(const char *user_cp); bool mp_charset_requires_guess(const char *user_cp); const char *mp_charset_guess(void *talloc_ctx, struct mp_log *log, bstr buf, const char *user_cp, int flags); -bstr mp_charset_guess_and_conv_to_utf8(struct mp_log *log, bstr buf, - const char *user_cp, int flags); bstr mp_iconv_to_utf8(struct mp_log *log, bstr buf, const char *cp, int flags); #endif |