diff options
| author | Max Kellermann <max@duempel.org> | 2009-12-14 17:40:50 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-12-14 17:40:50 +0100 |
| commit | c3085d7b6130f24c3a1675e902bffb23775d5c3e (patch) | |
| tree | 9960c6e1dbbebd9b99f7cec3dab8e54f06ef8182 /src/tag_id3.c | |
| parent | 179502fe93532a3686c08f07d9ef6effaaf4f25a (diff) | |
| parent | 8f7bc70bf5e47da66e57e5606b978ba3ee975d89 (diff) | |
Merge branch 'v0.15.x'
Conflicts:
src/decoder/ffmpeg_plugin.c
Diffstat (limited to 'src/tag_id3.c')
| -rw-r--r-- | src/tag_id3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tag_id3.c b/src/tag_id3.c index 81a994dc..4f1a248b 100644 --- a/src/tag_id3.c +++ b/src/tag_id3.c @@ -96,7 +96,7 @@ import_id3_string(bool 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'", |