summaryrefslogtreecommitdiffstats
path: root/misc/charset_conv.h
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 /misc/charset_conv.h
parent0335011f11d9d13f70db6c46ed6189a74d48ec67 (diff)
downloadmpv-33c8fd789dd967e4417157ef511fbd7dd33c209e.tar.bz2
mpv-33c8fd789dd967e4417157ef511fbd7dd33c209e.tar.xz
charset_conv: mp_msg conversions
Diffstat (limited to 'misc/charset_conv.h')
-rw-r--r--misc/charset_conv.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/misc/charset_conv.h b/misc/charset_conv.h
index c216ede2be..e9efa48444 100644
--- a/misc/charset_conv.h
+++ b/misc/charset_conv.h
@@ -4,6 +4,8 @@
#include <stdbool.h>
#include "bstr/bstr.h"
+struct mp_log;
+
enum {
MP_ICONV_VERBOSE = 1, // print errors instead of failing silently
MP_ICONV_ALLOW_CUTOFF = 2, // allow partial input data
@@ -12,8 +14,10 @@ enum {
bool mp_charset_is_utf8(const char *user_cp);
bool mp_charset_requires_guess(const char *user_cp);
-const char *mp_charset_guess(bstr buf, const char *user_cp, int flags);
-bstr mp_charset_guess_and_conv_to_utf8(bstr buf, const char *user_cp, int flags);
-bstr mp_iconv_to_utf8(bstr buf, const char *cp, int flags);
+const char *mp_charset_guess(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