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 --- demux/demux_libass.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'demux/demux_libass.c') diff --git a/demux/demux_libass.c b/demux/demux_libass.c index 15f5195cfc..0bbcb7c329 100644 --- a/demux/demux_libass.c +++ b/demux/demux_libass.c @@ -37,6 +37,7 @@ static int d_check_file(struct demuxer *demuxer, enum demux_check check) { const char *user_cp = demuxer->opts->sub_cp; struct stream *s = demuxer->stream; + struct mp_log *log = demuxer->log; // Older versions of libass will behave strange if renderer and track // library handles mismatch, so make sure everything uses a global handle. ASS_Library *lib = demuxer->params ? demuxer->params->ass_library : NULL; @@ -56,7 +57,7 @@ static int d_check_file(struct demuxer *demuxer, enum demux_check check) memcpy(tmp, buf.start, buf.len); buf.start = tmp; buf.start[buf.len] = '\0'; - bstr cbuf = mp_charset_guess_and_conv_to_utf8(buf, user_cp, + bstr cbuf = mp_charset_guess_and_conv_to_utf8(log, buf, user_cp, MP_ICONV_ALLOW_CUTOFF); if (cbuf.start == NULL) cbuf = buf; @@ -77,7 +78,7 @@ static int d_check_file(struct demuxer *demuxer, enum demux_check check) "larger than 100 MB: %s\n", demuxer->filename); return -1; } - bstr cbuf = mp_charset_guess_and_conv_to_utf8(buf, user_cp, + bstr cbuf = mp_charset_guess_and_conv_to_utf8(log, buf, user_cp, MP_ICONV_VERBOSE); if (cbuf.start == NULL) cbuf = buf; -- cgit v1.2.3