summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorsr55 <[email protected]>2011-04-18 12:10:07 +0000
committersr55 <[email protected]>2011-04-18 12:10:07 +0000
commite63f490b2e0a90bafb690e1d1f1f1e2f44729309 (patch)
treeba6efe28059341ad798d5e20d1682233e057e55c /test
parent4d2dce20625d08032eb25dd2d98c3d4319d8e0d9 (diff)
HE-AAC support for the OSX port. Thanks go to amarcus, ritsuka and rodeo.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3937 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'test')
-rw-r--r--test/test.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/test.c b/test/test.c
index c89267b9f..7cf65a5cf 100644
--- a/test/test.c
+++ b/test/test.c
@@ -2538,7 +2538,7 @@ static void ShowHelp()
#ifdef __APPLE_CC__
fprintf( out,
" -E, --aencoder <string> Audio encoder(s)\n"
- " (ca_aac/faac/lame/vorbis/ac3/copy/copy:ac3/copy:dts)\n"
+ " (ca_aac/ca_haac/faac/lame/vorbis/ac3/copy/copy:ac3/copy:dts)\n"
" copy, copy:ac3 and copy:dts meaning passthrough.\n"
" copy will passthrough either ac3 or dts.\n"
" Separated by commas for more than one audio track.\n"
@@ -3594,6 +3594,10 @@ static int get_acodec_for_string( char *codec )
{
return HB_ACODEC_CA_AAC;
}
+ else if( !strcasecmp( codec, "ca_haac") )
+ {
+ return HB_ACODEC_CA_HAAC;
+ }
#endif
else
{