# HG changeset patch
# User js
# Date 1171980670 28800
# Node ID 6dd733e046facca9ee33a263e825013d906cb7d3
# Parent  0d098b87207acdee5aeebc93382466987e2f91b3
[svn] Revert r1456, this gives problems with some files with broken ID3-Tags.

diff -r 0d098b87207a -r 6dd733e046fa ChangeLog
--- a/ChangeLog	Tue Feb 20 05:51:43 2007 -0800
+++ b/ChangeLog	Tue Feb 20 06:11:10 2007 -0800
@@ -1,3 +1,11 @@
+2007-02-20 13:51:43 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1458]
+  - remove some pointless bloat
+  
+  trunk/src/aac/src/libmp4.c |   39 ++++++++-------------------------------
+  1 file changed, 8 insertions(+), 31 deletions(-)
+
+
 2007-02-20 13:51:23 +0000  Jonathan Schleifer <js@h3c.de>
   revision [1456]
   Use g_convert instead of str_to_utf8. This fixes ID3-Tags with ISO8859-1 encoded umlauts.
diff -r 0d098b87207a -r 6dd733e046fa src/madplug/input.c
--- a/src/madplug/input.c	Tue Feb 20 05:51:43 2007 -0800
+++ b/src/madplug/input.c	Tue Feb 20 06:11:10 2007 -0800
@@ -311,7 +311,7 @@
     switch (encoding) {
     case ID3_FIELD_TEXTENCODING_ISO_8859_1:
         rtn0 = (gchar *)id3_ucs4_latin1duplicate(string);
-        rtn = g_convert(rtn0, -1, "utf8", "iso8859-1", NULL, NULL, NULL);
+        rtn = str_to_utf8(rtn0);
         g_free(rtn0);
         break;
     case ID3_FIELD_TEXTENCODING_UTF_8: