# HG changeset patch
# User Eric Wing <ewing . public |-at-| gmail . com>
# Date 1290565544 28800
# Node ID 2264b134b7ac3e182f63443a84d2fc987aeedc39
# Parent  33a77ceaed261b9bf02bcb584438f264df28f44a# Parent  6927c489964ce3c608e6044fd9c6e836fef81b23
merged

diff -r 6927c489964c -r 2264b134b7ac decoders/coreaudio.c
--- a/decoders/coreaudio.c	Mon Nov 08 21:02:49 2010 -0800
+++ b/decoders/coreaudio.c	Tue Nov 23 18:25:44 2010 -0800
@@ -59,16 +59,20 @@
 	"mp4",
 	"m4a",
 	"aac",
+	"adts",
 	"caf",
 	"Sd2f",
 	"Sd2",
 	"au",
+	"snd",
 	"next",
 	"mp2",
 	"mp1",
 	"ac3",
 	"3gpp",
+	"3gp",
 	"3gp2",
+	"3g2",
 	"amrf",
 	"amr",
 	"ima4",
@@ -159,7 +163,7 @@
 	{
 		return kAudioFileAAC_ADTSType;
 	}
-	else if( (__Sound_strcasecmp(file_extension, "aac") == 0)
+	else if( (__Sound_strcasecmp(file_extension, "adts") == 0)
 	)
 	{
 		return kAudioFileAAC_ADTSType;
@@ -177,6 +181,7 @@
 		return kAudioFileSoundDesigner2Type;
 	}
 	else if( (__Sound_strcasecmp(file_extension, "au") == 0)
+		|| (__Sound_strcasecmp(file_extension, "snd") == 0)
 		|| (__Sound_strcasecmp(file_extension, "next") == 0)
 	)
 	{
@@ -198,11 +203,13 @@
 		return kAudioFileAC3Type;
 	}
 	else if( (__Sound_strcasecmp(file_extension, "3gpp") == 0)
+			|| (__Sound_strcasecmp(file_extension, "3gp") == 0)		
 	)
 	{
 		return kAudioFile3GPType;
 	}
 	else if( (__Sound_strcasecmp(file_extension, "3gp2") == 0)
+			|| (__Sound_strcasecmp(file_extension, "3g2") == 0)
 	)
 	{
 		return kAudioFile3GP2Type;