diff options
-rw-r--r-- | apps/codecs/libm4a/demux.c | 1 | ||||
-rw-r--r-- | apps/metadata.c | 5 |
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) | |||
60 | type = stream_read_uint32(qtmovie->stream); | 60 | type = stream_read_uint32(qtmovie->stream); |
61 | size_remaining-=4; | 61 | size_remaining-=4; |
62 | if ((type != MAKEFOURCC('M','4','A',' ')) && | 62 | if ((type != MAKEFOURCC('M','4','A',' ')) && |
63 | (type != MAKEFOURCC('M','4','B',' ')) && | ||
63 | (type != MAKEFOURCC('m','p','4','2')) && | 64 | (type != MAKEFOURCC('m','p','4','2')) && |
64 | (type != MAKEFOURCC('3','g','p','6')) && | 65 | (type != MAKEFOURCC('3','g','p','6')) && |
65 | (type != MAKEFOURCC('q','t',' ',' '))) | 66 | (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 }; | |||
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, |