- Add CoreAudio AAC as one of the encoder on Mac OS X.

- Remove hb_init() and hb_init_express() macro. Rename hb_init_real() to hb_init()
- Add two more bitrate combination for audio codecs in common.h

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2441 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 7 insertions, 1 deletions

diff --git a/test/module.defs b/test/module.defs
index 01408234c..9be48b418 100644
--- a/test/module.defs
+++ b/test/module.defs
@@ -36,7 +36,7 @@ BUILD.out += $(TEST.install.exe)
 TEST.GCC.I += $(LIBHB.GCC.I)
 
 ifeq ($(BUILD.system),darwin)
-    TEST.GCC.f += IOKit CoreServices
+    TEST.GCC.f += IOKit CoreServices AudioToolbox
     TEST.GCC.l += bz2 z
 else ifeq ($(BUILD.system),linux)
     TEST.GCC.l += bz2 z pthread dl m
diff --git a/test/test.c b/test/test.c
index 44e44d14f..3c93cecd5 100644
--- a/test/test.c
+++ b/test/test.c
@@ -2747,6 +2747,12 @@ static int get_acodec_for_string( char *codec )
     {
         return HB_ACODEC_VORBIS;
     }
+#ifdef __APPLE__
+    else if( !strcasecmp( codec, "ca_aac") )
+    {
+        return HB_ACODEC_CA_AAC;
+    }
+#endif
     else
     {
         return -1;