From 768561ada96cd0149ed115748c95a32357676b38 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Sat, 15 Jun 2013 17:24:35 +0000 Subject: improve aac encoder build options and change some aac encoder defaults By default, faac is no longer built. Libav aac is now the default aac encoder on all platforms except osx where ca_aac is the default. fdk-aac is now built by default (except on osx). git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5581 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- make/configure.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'make/configure.py') diff --git a/make/configure.py b/make/configure.py index b3da14dd8..af893ddae 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1177,7 +1177,16 @@ def createCLI(): grp.add_option( '--enable-ff-mpeg2', default=False, action='store_true', help=h ) h = IfHost( 'enable use of fdk-aac encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value - grp.add_option( '--enable-fdk-aac', default=False, action='store_true', help=h ) + grp.add_option( '--enable-fdk-aac', dest="enable_fdk_aac", default=not host.match( '*-*-darwin*' ), action='store_true', help=h ) + grp.add_option( '--disable-fdk-aac', dest="enable_fdk_aac", action='store_false' ) + + h = IfHost( 'enable use of libav aac encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value + grp.add_option( '--enable-libav-aac', dest="enable_libav_aac", default=not host.match( '*-*-darwin*' ), action='store_true', help=h ) + grp.add_option( '--disable-libav-aac', dest="enable_libav_aac", action='store_false' ) + + h = IfHost( 'enable use of faac encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value + grp.add_option( '--enable-faac', dest="enable_faac", default=False, action='store_true', help=h ) + grp.add_option( '--disable-faac', dest="enable_faac", action='store_false' ) cli.add_option_group( grp ) @@ -1618,7 +1627,9 @@ int main () doc.add( 'FEATURE.gtk.mingw', int( options.enable_gtk_mingw )) doc.add( 'FEATURE.gst', int( not options.disable_gst )) doc.add( 'FEATURE.ff.mpeg2', int( options.enable_ff_mpeg2 )) - doc.add( 'FEATURE.fdk_aac', int( options.enable_fdk_aac )) + doc.add( 'FEATURE.fdk_aac', int( options.enable_fdk_aac )) + doc.add( 'FEATURE.libav_aac', int( options.enable_libav_aac )) + doc.add( 'FEATURE.faac', int( options.enable_faac )) doc.add( 'FEATURE.xcode', int( not (Tools.xcodebuild.fail or options.disable_xcode or options.cross) )) if not Tools.xcodebuild.fail and not options.disable_xcode: -- cgit v1.2.3