AAC codec: accept M4B files.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11681 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 4 insertions, 2 deletions

diff --git a/apps/codecs/libm4a/demux.c b/apps/codecs/libm4a/demux.c
index d560256cd9..34bc07556b 100644
--- a/apps/codecs/libm4a/demux.c
+++ b/apps/codecs/libm4a/demux.c
@@ -60,6 +60,7 @@ static void read_chunk_ftyp(qtmovie_t *qtmovie, size_t chunk_len)
     type = stream_read_uint32(qtmovie->stream);
     size_remaining-=4;
     if ((type != MAKEFOURCC('M','4','A',' ')) &&
+        (type != MAKEFOURCC('M','4','B',' ')) &&
         (type != MAKEFOURCC('m','p','4','2')) &&
         (type != MAKEFOURCC('3','g','p','6')) &&
         (type != MAKEFOURCC('q','t',' ',' ')))
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 };
 #define MP4_hdlr MP4_ID('h', 'd', 'l', 'r')
 #define MP4_ilst MP4_ID('i', 'l', 's', 't')
 #define MP4_M4A  MP4_ID('M', '4', 'A', ' ')
+#define MP4_M4B  MP4_ID('M', '4', 'B', ' ')
 #define MP4_mdat MP4_ID('m', 'd', 'a', 't')
 #define MP4_mdia MP4_ID('m', 'd', 'i', 'a')
 #define MP4_mdir MP4_ID('m', 'd', 'i', 'r')
@@ -1318,8 +1319,8 @@ static bool read_mp4_container(int fd, struct mp3entry* id3,
                 read_uint32be(fd, &id);
                 size -= 4;
                 
-                if ((id != MP4_M4A) && (id != MP4_mp42) && (id != MP4_qt)
-                    && (id != MP4_3gp6))
+                if ((id != MP4_M4A) && (id != MP4_M4B) && (id != MP4_mp42) 
+                    && (id != MP4_qt) && (id != MP4_3gp6))
                 {
                     DEBUGF("Unknown MP4 file type: '%c%c%c%c'\n", 
                         id >> 24 & 0xff, id >> 16 & 0xff, id >> 8 & 0xff,