From 33c8fd789dd967e4417157ef511fbd7dd33c209e Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 21 Dec 2013 20:37:16 +0100 Subject: charset_conv: mp_msg conversions --- sub/dec_sub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sub') 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; } -- cgit v1.2.3