diff options
| author | jstebbins <[email protected]> | 2013-03-03 16:18:16 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2013-03-03 16:18:16 +0000 |
| commit | 288639e626b5c550fdd33e49abf1b8e3a3fcd52e (patch) | |
| tree | 0df5c1da8728a0706110984b675a0d3b7a350ba9 /make | |
| parent | b56a9d0fc23ca64f1d63afb797bdc07e1dffc357 (diff) | |
Add optional fdk-aac encoder
configure --enable-fdk-aac to enable this encoder
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5287 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'make')
| -rw-r--r-- | make/configure.py | 4 | ||||
| -rw-r--r-- | make/include/main.defs | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/make/configure.py b/make/configure.py index 0d9b494cb..835984f83 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1176,6 +1176,9 @@ def createCLI(): h = IfHost( 'enable use of ffmpeg mpeg2 decoding', '*-*-*', none=optparse.SUPPRESS_HELP ).value 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 ) + cli.add_option_group( grp ) ## add launch options @@ -1615,6 +1618,7 @@ 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.xcode', int( not (Tools.xcodebuild.fail or options.disable_xcode or options.cross) )) if not Tools.xcodebuild.fail and not options.disable_xcode: diff --git a/make/include/main.defs b/make/include/main.defs index 5a7519e50..45d375c36 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -39,6 +39,10 @@ ifneq (,$(filter $(BUILD.system),darwin cygwin mingw)) MODULES += contrib/libsamplerate endif +ifeq (1,$(FEATURE.fdk_aac)) + MODULES += contrib/fdk-aac +endif + MODULES += contrib/lame MODULES += contrib/faac MODULES += contrib/ffmpeg |