# HG changeset patch
# User js
# Date 1171979483 28800
# Node ID 46743e3ebcc1ff4e88dea4961ad11b432ed5301a
# Parent  c9eaa64b92b3d48d176a1bbfe4da154d7a5fdcd3
[svn] Use g_convert instead of str_to_utf8. This fixes ID3-Tags with ISO8859-1 encoded umlauts.

diff -r c9eaa64b92b3 -r 46743e3ebcc1 ChangeLog
--- a/ChangeLog	Tue Feb 20 05:47:25 2007 -0800
+++ b/ChangeLog	Tue Feb 20 05:51:23 2007 -0800
@@ -1,3 +1,11 @@
+2007-02-20 13:47:25 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1454]
+  - aacplus shoutcast support. prepare for segfaults.
+  
+  trunk/src/aac/src/libmp4.c |   55 ++++++++++++++++++++++++++++++++++++++++-----
+  1 file changed, 49 insertions(+), 6 deletions(-)
+
+
 2007-02-20 12:56:39 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [1452]
   - sbr decoding is not fixed point
diff -r c9eaa64b92b3 -r 46743e3ebcc1 src/madplug/input.c
--- a/src/madplug/input.c	Tue Feb 20 05:47:25 2007 -0800
+++ b/src/madplug/input.c	Tue Feb 20 05:51:23 2007 -0800
@@ -311,7 +311,7 @@
     switch (encoding) {
     case ID3_FIELD_TEXTENCODING_ISO_8859_1:
         rtn0 = (gchar *)id3_ucs4_latin1duplicate(string);
-        rtn = str_to_utf8(rtn0);
+        rtn = g_convert(rtn0, -1, "utf8", "iso8859-1", NULL, NULL, NULL);
         g_free(rtn0);
         break;
     case ID3_FIELD_TEXTENCODING_UTF_8: