diff options
| author | John Stebbins <[email protected]> | 2016-02-10 12:25:33 -0700 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2016-02-10 12:27:06 -0700 |
| commit | 2caf380a1021b294fd26eb310bd41e59b7f1db11 (patch) | |
| tree | 5ec556e05b4b50160804fd35113c96a81e5bfbd6 | |
| parent | c8ed04fe005ac461570a745f69b5be8fd5ebbbd8 (diff) | |
build: do not enable fdk-aac by default
There is a license incompatibility with gpl :(
(cherry picked from commit 6da861c9dc023e5b7cad648d596f571ee1214bbf)
| -rw-r--r-- | make/configure.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/make/configure.py b/make/configure.py index 82350c580..319fe7ad7 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1253,7 +1253,7 @@ def createCLI(): grp.add_option( '--disable-x265', dest="enable_x265", action='store_false' ) h = IfHost( 'enable use of fdk-aac encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value - grp.add_option( '--enable-fdk-aac', dest="enable_fdk_aac", default=not host.match( '*-*-darwin*' ), action='store_true', help=h ) + grp.add_option( '--enable-fdk-aac', dest="enable_fdk_aac", default=False, 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 |