summaryrefslogtreecommitdiffstats
path: root/apps/codecs/libm4a
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2011-02-03 08:28:23 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2011-02-03 08:28:23 +0000
commit7345ac124e3b56a402b6a004d968d40b4ffeaa50 (patch)
treeb5ebad1095949bdc1c4edb18e45c9b5a2d946c06 /apps/codecs/libm4a
parent1bb3d61ef372e00986dd03672de944f756aeab4a (diff)
downloadrockbox-7345ac124e3b56a402b6a004d968d40b4ffeaa50.tar.gz
rockbox-7345ac124e3b56a402b6a004d968d40b4ffeaa50.zip
Submit FS#11918: Add 2 more codec types to be able to differentiate between AAC / AAC-HE and MPC SV7 / SV8. Additionally handle ATARI soundfiles in get_codec_base_type() as intended.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29199 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libm4a')
-rw-r--r--apps/codecs/libm4a/demux.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/codecs/libm4a/demux.c b/apps/codecs/libm4a/demux.c
index 8fc90c8092..e584c37858 100644
--- a/apps/codecs/libm4a/demux.c
+++ b/apps/codecs/libm4a/demux.c
@@ -257,7 +257,8 @@ static bool read_chunk_stsd(qtmovie_t *qtmovie, size_t chunk_len)
stream_skip(qtmovie->stream, entry_remaining);
} else if (qtmovie->res->format==MAKEFOURCC('m','p','4','a')) {
- if (qtmovie->stream->ci->id3->codectype!=AFMT_MP4_AAC) {
+ if (qtmovie->stream->ci->id3->codectype!=AFMT_MP4_AAC &&
+ qtmovie->stream->ci->id3->codectype!=AFMT_MP4_AAC_HE) {
return false;
}