diff options
| author | Rodeo <[email protected]> | 2014-02-10 17:41:56 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2014-02-10 17:41:56 +0000 |
| commit | c004afa6a6c12b16b42bc1792495145ba5558927 (patch) | |
| tree | edd4b47fc66ebccfdf5f97a92e81b2213d1ff7ec /make | |
| parent | e1e76b53cd11e7706e884d802c5985633b849e4f (diff) | |
Missing in last commit. Also by Zhang Zhiqiang. Thanks!
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6024 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 9a9285cb1..ea9c8b3c2 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1207,6 +1207,9 @@ def createCLI(): h = IfHost( 'enable HWD features', '*-*-*', none=optparse.SUPPRESS_HELP ).value grp.add_option( '--enable-hwd', default=False, action='store_true', help=h ) + h = IfHost( 'enable use of x265 encoding', '*-*-*', none=optparse.SUPPRESS_HELP ).value + grp.add_option( '--enable-x265', 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', 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' ) @@ -1687,6 +1690,7 @@ int main () doc.add( 'FEATURE.qsv', int( options.enable_qsv )) doc.add( 'FEATURE.hwd', int( options.enable_hwd )) doc.add( 'FEATURE.xcode', int( not (Tools.xcodebuild.fail or options.disable_xcode or options.cross) )) + doc.add( 'FEATURE.x265', int( options.enable_x265 )) if not Tools.xcodebuild.fail and not options.disable_xcode: doc.addBlank() diff --git a/make/include/main.defs b/make/include/main.defs index 0cec07d0e..93d99fc15 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -59,6 +59,10 @@ ifeq (1,$(FEATURE.libmkv)) MODULES += contrib/libmkv endif +ifeq (1,$(FEATURE.x265)) + MODULES += contrib/x265 +endif + MODULES += contrib/lame MODULES += contrib/ffmpeg MODULES += contrib/libdvdread |