diff options
Diffstat (limited to 'lib/rbcodec/codecs/libm4a/demux.c')
-rw-r--r-- | lib/rbcodec/codecs/libm4a/demux.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/lib/rbcodec/codecs/libm4a/demux.c b/lib/rbcodec/codecs/libm4a/demux.c index 47cce9857f..2b56759b9c 100644 --- a/lib/rbcodec/codecs/libm4a/demux.c +++ b/lib/rbcodec/codecs/libm4a/demux.c | |||
@@ -56,22 +56,13 @@ typedef struct | |||
56 | /* chunk handlers */ | 56 | /* chunk handlers */ |
57 | static void read_chunk_ftyp(qtmovie_t *qtmovie, size_t chunk_len) | 57 | static void read_chunk_ftyp(qtmovie_t *qtmovie, size_t chunk_len) |
58 | { | 58 | { |
59 | fourcc_t type; | ||
60 | size_t size_remaining = chunk_len - 8; | 59 | size_t size_remaining = chunk_len - 8; |
61 | 60 | ||
62 | type = stream_read_uint32(qtmovie->stream); | 61 | // filetype (supported ignore case values: m4a, m4b, mp42, 3gp6, qt, isom) |
62 | char filetype[4]; | ||
63 | stream_read(qtmovie->stream, 4, filetype); | ||
63 | size_remaining-=4; | 64 | size_remaining-=4; |
64 | if ((type != MAKEFOURCC('M','4','A',' ')) && | 65 | |
65 | (type != MAKEFOURCC('m','4','a',' ')) && | ||
66 | (type != MAKEFOURCC('M','4','B',' ')) && | ||
67 | (type != MAKEFOURCC('m','p','4','2')) && | ||
68 | (type != MAKEFOURCC('3','g','p','6')) && | ||
69 | (type != MAKEFOURCC('q','t',' ',' ')) && | ||
70 | (type != MAKEFOURCC('i','s','o','m'))) | ||
71 | { | ||
72 | DEBUGF("not M4A file\n"); | ||
73 | return; | ||
74 | } | ||
75 | /* minor_ver = */ stream_read_uint32(qtmovie->stream); | 66 | /* minor_ver = */ stream_read_uint32(qtmovie->stream); |
76 | size_remaining-=4; | 67 | size_remaining-=4; |
77 | 68 | ||