From bbbb2d9723e009378c52c6552810a1b648696cd2 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 2 Aug 2015 18:21:22 +0200
Subject: charset_conv: fix switched parameters

Fixes #2186.
---
 misc/charset_conv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
cgit v1.2.3