summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-08-02 18:21:22 +0200
committerwm4 <wm4@nowhere>2015-08-02 18:21:22 +0200
commitbbbb2d9723e009378c52c6552810a1b648696cd2 (patch)
tree59e7c4f68a1de0d26f2b5226ed784e10c0b92342 /misc
parentaa0157d9b8fc06de730a3572d7096a4d0de9ae3c (diff)
downloadmpv-bbbb2d9723e009378c52c6552810a1b648696cd2.tar.bz2
mpv-bbbb2d9723e009378c52c6552810a1b648696cd2.tar.xz
charset_conv: fix switched parameters
Fixes #2186.
Diffstat (limited to 'misc')
-rw-r--r--misc/charset_conv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/charset_conv.c b/misc/charset_conv.c
index b96b9bb8c8..b611538bc1 100644
--- a/misc/charset_conv.c
+++ b/misc/charset_conv.c
@@ -266,7 +266,7 @@ 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(log, tmp, buf, user_cp, flags);
+ 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;