summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2005-10-31 20:45:12 +0000
committerDave Chapman <dave@dchapman.com>2005-10-31 20:45:12 +0000
commit5ffbb4eb11be5e2213fd3cc5c6a1015105f51638 (patch)
tree0c221c70bed4da50edb60067c454f82d313302ac
parentc3f901be565682a6765249cebe8e58f9afeb8cfd (diff)
downloadrockbox-5ffbb4eb11be5e2213fd3cc5c6a1015105f51638.zip
rockbox-5ffbb4eb11be5e2213fd3cc5c6a1015105f51638.tar.gz
rockbox-5ffbb4eb11be5e2213fd3cc5c6a1015105f51638.tar.bz2
rockbox-5ffbb4eb11be5e2213fd3cc5c6a1015105f51638.tar.xz
Add AAC audio type
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7703 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/id3.h1
-rw-r--r--firmware/id3.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/firmware/export/id3.h b/firmware/export/id3.h
index 0ef3d52..acac8dc 100644
--- a/firmware/export/id3.h
+++ b/firmware/export/id3.h
@@ -39,6 +39,7 @@ enum {
AFMT_A52, /* A/52 (aka AC3) audio */
AFMT_WAVPACK, /* WavPack */
AFMT_ALAC, /* Apple Lossless Audio Codec */
+ AFMT_AAC, /* Advanced Audio Coding (AAC) in M4A container */
/* New formats must be added to the end of this list */
diff --git a/firmware/id3.c b/firmware/id3.c
index 1ca8bd4..9522f5f 100644
--- a/firmware/id3.c
+++ b/firmware/id3.c
@@ -99,6 +99,7 @@ static const char* const codec_labels[] = {
"AC3", /* A/52 (aka AC3) audio */
"WV", /* WavPack */
"ALAC", /* Apple Lossless Audio Codec */
+ "AAC", /* Advanced Audio Coding in M4A container */
#endif
};