changeset 696:c787612e29ff trunk

[svn] - temporary workaround for ISO-8859-1 8bit character does not appear correctly.
author yaz
date Tue, 20 Feb 2007 09:02:15 -0800
parents e6b3dddb3c35
children 74a762a3592e
files ChangeLog src/madplug/input.c
diffstat 2 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Feb 20 08:52:37 2007 -0800
+++ b/ChangeLog	Tue Feb 20 09:02:15 2007 -0800
@@ -1,3 +1,11 @@
+2007-02-20 16:52:37 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1476]
+  - no idea why we were using a dynamically allocated buffer for raw aac
+  
+  trunk/src/aac/src/libmp4.c |   13 +------------
+  1 file changed, 1 insertion(+), 12 deletions(-)
+
+
 2007-02-20 16:47:44 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [1474]
   - handle a situation where buffer could be NULL (e.g. bail)
--- a/src/madplug/input.c	Tue Feb 20 08:52:37 2007 -0800
+++ b/src/madplug/input.c	Tue Feb 20 09:02:15 2007 -0800
@@ -311,7 +311,11 @@
     switch (encoding) {
     case ID3_FIELD_TEXTENCODING_ISO_8859_1:
         rtn0 = (gchar *)id3_ucs4_latin1duplicate(string);
+#ifdef USE_CHARDET
         rtn = str_to_utf8(rtn0);
+#else
+	rtn = g_convert(rtn0, -1, "UTF-8", "ISO-8859-1", NULL, NULL, NULL);
+#endif
         g_free(rtn0);
         break;
     case ID3_FIELD_TEXTENCODING_UTF_8: