From 237ca504e12c06a5cfa7cd0fb9d9c672dc588f1c Mon Sep 17 00:00:00 2001 From: Andree Buschmann Date: Tue, 15 Feb 2011 20:00:28 +0000 Subject: All AAC-HE files will double the frame sample count, not only AAC-HE files with SBR upsampling. This change fixes issues with some m4a files reported in the forums. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29310 a1c6a512-1295-4272-9138-f99709370657 --- apps/metadata/metadata_common.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'apps/metadata/metadata_common.c') diff --git a/apps/metadata/metadata_common.c b/apps/metadata/metadata_common.c index e1ef9a0d62..4f001775f3 100644 --- a/apps/metadata/metadata_common.c +++ b/apps/metadata/metadata_common.c @@ -337,7 +337,10 @@ long parse_tag(const char* name, char* value, struct mp3entry* id3, p = NULL; } - if (p) + /* Do not overwrite already available metadata. Especially when reading + * tags with e.g. multiple genres / artists. This way only the first + * of multiple entries is used, all following are dropped. */ + if (p!=NULL && *p==NULL) { len = strlen(value); len = MIN(len, buf_remaining - 1); -- cgit v1.2.3