summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2011-01-09 21:19:16 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2011-01-09 21:19:16 +0000
commit9cb473319370810fbab474d26524d927d908c91f (patch)
tree53484c3b6c1cec748742aab33a964773d629d2e6
parent0afad89f5350e586d808326913005580b8f3ffc9 (diff)
downloadrockbox-9cb473319370810fbab474d26524d927d908c91f.tar.gz
rockbox-9cb473319370810fbab474d26524d927d908c91f.tar.bz2
rockbox-9cb473319370810fbab474d26524d927d908c91f.zip
Fix FS#11858 which was introduced with r28937. Several *.rm were not played because the parser aborted with error for several files.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29015 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/metadata/rm.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/metadata/rm.c b/apps/metadata/rm.c
index 0b26a36ffc..8dc4fbe8db 100644
--- a/apps/metadata/rm.c
+++ b/apps/metadata/rm.c
@@ -375,10 +375,17 @@ static int rm_parse_header(int fd, RMContext *rmctx, struct mp3entry *id3)
else
skipped += temp;
}
+ else if (v == FOURCC('L','S','D',':'))
+ {
+ DEBUGF("Real audio lossless is not supported.");
+ return -1;
+ }
else
{
+ /* We shall not abort with -1 here. *.rm file often seem
+ * to have a second media properties header that contains
+ * other metadata. */
DEBUGF("Unknown header signature :\"%s\"\n", fourcc2str(v));
- return -1;
}