From 7162fe85ce3008c6bcd2d4b2dfe6505b8a205479 Mon Sep 17 00:00:00 2001
From: svitoos <svitoos@gmail.com>
Date: Mon, 30 Nov 2009 17:42:46 +0100
Subject: [PATCH] tag_id3: fix ID3v1 charset conversion

If we define id3v1_encoding, then the tags are not added to the
database.
---
 NEWS          | 2 ++
 src/tag_id3.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index e566504d2..c627f6dc3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 ver 0.15.7 (2009/??/??)
+* tags:
+  - id3: fix ID3v1 charset conversion
 * decoders:
   - ffmpeg: don't try to force stereo
 
diff --git a/src/tag_id3.c b/src/tag_id3.c
index 0ae37f3ec..a33ebc00b 100644
--- a/src/tag_id3.c
+++ b/src/tag_id3.c
@@ -90,7 +90,7 @@ static id3_utf8_t * processID3FieldString (int is_id3v1, const id3_ucs4_t *ucs4,
 
 		utf8 = (id3_utf8_t *)
 			g_convert_with_fallback((const char*)isostr, -1,
-						encoding, "utf-8",
+						"utf-8", encoding,
 						NULL, NULL, NULL, NULL);
 		if (utf8 == NULL) {
 			g_debug("Unable to convert %s string to UTF-8: '%s'",