summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-11-11 21:28:20 +0100
committerwm4 <wm4@nowhere>2015-11-11 21:28:20 +0100
commit384b13c5fd3fa87bad4bedbb3db369cdfb05de2b (patch)
treeda1587737665748e29dd7ddd39d9ae4fa66c8b8e /misc
parent977869a804b0fca932bcbe1d26b756d2e9860d0f (diff)
downloadmpv-384b13c5fd3fa87bad4bedbb3db369cdfb05de2b.tar.bz2
mpv-384b13c5fd3fa87bad4bedbb3db369cdfb05de2b.tar.xz
demux_libass: remove this demuxer
This loaded external .ass files via libass. libavformat's .ass reader is now good enough, so use that instead. Apparently libavformat still doesn't support fonts embedded into text .ass files, but support for this has been accidentally broken in mpv for a while anyway. (And only 1 person complained.)
Diffstat (limited to 'misc')
-rw-r--r--misc/charset_conv.c18
-rw-r--r--misc/charset_conv.h2
2 files changed, 0 insertions, 20 deletions
diff --git a/misc/charset_conv.c b/misc/charset_conv.c
index bceb52aa58..3e7e47cc58 100644
--- a/misc/charset_conv.c
+++ b/misc/charset_conv.c
@@ -259,24 +259,6 @@ const char *mp_charset_guess(void *talloc_ctx, struct mp_log *log, bstr buf,
return res;
}
-// Convert the data in buf to UTF-8. The charset argument can be an iconv
-// codepage, a value returned by mp_charset_conv_guess(), or a special value
-// that triggers autodetection of the charset (e.g. using ENCA).
-// The auto-detection is the only difference to mp_iconv_to_utf8().
-// buf: same as mp_iconv_to_utf8()
-// user_cp: iconv codepage, special value, NULL
-// flags: same as mp_iconv_to_utf8()
-// returns: same as mp_iconv_to_utf8()
-bstr mp_charset_guess_and_conv_to_utf8(struct mp_log *log, bstr buf,
- const char *user_cp, int flags)
-{
- void *tmp = talloc_new(NULL);
- const char *cp = mp_charset_guess(tmp, log, buf, user_cp, flags);
- bstr res = mp_iconv_to_utf8(log, buf, cp, flags);
- talloc_free(tmp);
- return res;
-}
-
// Use iconv to convert buf to UTF-8.
// Returns buf.start==NULL on error. Returns buf if cp is NULL, or if there is
// obviously no conversion required (e.g. if cp is "UTF-8").
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