diff options
author | Magnus Holmgren <magnushol@gmail.com> | 2006-12-07 09:24:31 +0000 |
---|---|---|
committer | Magnus Holmgren <magnushol@gmail.com> | 2006-12-07 09:24:31 +0000 |
commit | de100c36cbb791e7f44f8c77acc3ececdc6781ec (patch) | |
tree | 99b666633ba00d2f2d3524e9b33cdfd6019411c6 /apps/metadata.c | |
parent | 7aab5302accf8ba14ca05401a053f83da11479fe (diff) | |
download | rockbox-de100c36cbb791e7f44f8c77acc3ececdc6781ec.tar.gz rockbox-de100c36cbb791e7f44f8c77acc3ececdc6781ec.zip |
AAC codec: accept M4B files.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11681 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/metadata.c')
-rw-r--r-- | apps/metadata.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/metadata.c b/apps/metadata.c index 9ab821314e..d6b02966f6 100644 --- a/apps/metadata.c +++ b/apps/metadata.c | |||
@@ -55,6 +55,7 @@ enum tagtype { TAGTYPE_APE = 1, TAGTYPE_VORBIS }; | |||
55 | #define MP4_hdlr MP4_ID('h', 'd', 'l', 'r') | 55 | #define MP4_hdlr MP4_ID('h', 'd', 'l', 'r') |
56 | #define MP4_ilst MP4_ID('i', 'l', 's', 't') | 56 | #define MP4_ilst MP4_ID('i', 'l', 's', 't') |
57 | #define MP4_M4A MP4_ID('M', '4', 'A', ' ') | 57 | #define MP4_M4A MP4_ID('M', '4', 'A', ' ') |
58 | #define MP4_M4B MP4_ID('M', '4', 'B', ' ') | ||
58 | #define MP4_mdat MP4_ID('m', 'd', 'a', 't') | 59 | #define MP4_mdat MP4_ID('m', 'd', 'a', 't') |
59 | #define MP4_mdia MP4_ID('m', 'd', 'i', 'a') | 60 | #define MP4_mdia MP4_ID('m', 'd', 'i', 'a') |
60 | #define MP4_mdir MP4_ID('m', 'd', 'i', 'r') | 61 | #define MP4_mdir MP4_ID('m', 'd', 'i', 'r') |
@@ -1318,8 +1319,8 @@ static bool read_mp4_container(int fd, struct mp3entry* id3, | |||
1318 | read_uint32be(fd, &id); | 1319 | read_uint32be(fd, &id); |
1319 | size -= 4; | 1320 | size -= 4; |
1320 | 1321 | ||
1321 | if ((id != MP4_M4A) && (id != MP4_mp42) && (id != MP4_qt) | 1322 | if ((id != MP4_M4A) && (id != MP4_M4B) && (id != MP4_mp42) |
1322 | && (id != MP4_3gp6)) | 1323 | && (id != MP4_qt) && (id != MP4_3gp6)) |
1323 | { | 1324 | { |
1324 | DEBUGF("Unknown MP4 file type: '%c%c%c%c'\n", | 1325 | DEBUGF("Unknown MP4 file type: '%c%c%c%c'\n", |
1325 | id >> 24 & 0xff, id >> 16 & 0xff, id >> 8 & 0xff, | 1326 | id >> 24 & 0xff, id >> 16 & 0xff, id >> 8 & 0xff, |