summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-21 20:37:16 +0100
committerwm4 <wm4@nowhere>2013-12-21 21:43:16 +0100
commit33c8fd789dd967e4417157ef511fbd7dd33c209e (patch)
tree649c7a0224762b64946e8b7d7646147f2cee78c2 /sub
parent0335011f11d9d13f70db6c46ed6189a74d48ec67 (diff)
downloadmpv-33c8fd789dd967e4417157ef511fbd7dd33c209e.tar.bz2
mpv-33c8fd789dd967e4417157ef511fbd7dd33c209e.tar.xz
charset_conv: mp_msg conversions
Diffstat (limited to 'sub')
-rw-r--r--sub/dec_sub.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sub/dec_sub.c b/sub/dec_sub.c
index d896f92315..d94d1f0567 100644
--- a/sub/dec_sub.c
+++ b/sub/dec_sub.c
@@ -233,7 +233,7 @@ static struct demux_packet *recode_packet(struct mp_log *log,
{
struct demux_packet *pkt = NULL;
bstr in_buf = {in->buffer, in->len};
- bstr conv = mp_iconv_to_utf8(in_buf, charset, MP_ICONV_VERBOSE);
+ bstr conv = mp_iconv_to_utf8(log, in_buf, charset, MP_ICONV_VERBOSE);
if (conv.start && conv.start != in_buf.start) {
pkt = talloc_ptrtype(NULL, pkt);
talloc_steal(pkt, conv.start);
@@ -292,7 +292,7 @@ static const char *guess_sub_cp(struct mp_log *log, struct packet_list *subs,
memcpy(text.start + text.len + pkt->len, sep, sep_len);
text.len += pkt->len + sep_len;
}
- const char *guess = mp_charset_guess(text, usercp, 0);
+ const char *guess = mp_charset_guess(log, text, usercp, 0);
talloc_free(text.start);
return guess;
}