changeset 701:07fa51808275 trunk

[svn] - remove workaround.
author yaz
date Wed, 21 Feb 2007 04:41:29 -0800
parents 27a557e80e15
children d25b51e90542
files ChangeLog src/madplug/input.c
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Feb 21 02:02:10 2007 -0800
+++ b/ChangeLog	Wed Feb 21 04:41:29 2007 -0800
@@ -1,3 +1,11 @@
+2007-02-21 10:02:10 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1486]
+  - fix a ringbuffering error. found by purify.
+  
+  trunk/src/aac/src/libmp4.c |   11 +++++++----
+  1 file changed, 7 insertions(+), 4 deletions(-)
+
+
 2007-02-21 02:12:05 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [1484]
   - TCON frame without string crashes mad_parse_genre().
--- a/src/madplug/input.c	Wed Feb 21 02:02:10 2007 -0800
+++ b/src/madplug/input.c	Wed Feb 21 04:41:29 2007 -0800
@@ -314,11 +314,7 @@
     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: