diff options
| author | Rodeo <[email protected]> | 2013-08-22 20:33:35 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2013-08-22 20:33:35 +0000 |
| commit | d41905d539046445e1b81499ff7bd04d170c91d4 (patch) | |
| tree | 3f39a09e757bca8bc461d46303a2cb1c35e8d9a6 /make | |
| parent | c1a493b581f0567eba92625f2ee132de8e7f1d6d (diff) | |
Big merge, QSV to trunk: part 1 (tracked files).
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5737 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'make')
| -rw-r--r-- | make/configure.py | 3 | ||||
| -rw-r--r-- | make/include/main.defs | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/make/configure.py b/make/configure.py index 9a98017ce..d558372ab 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1175,6 +1175,8 @@ def createCLI(): grp.add_option( '--disable-gst', default=False, action='store_true', help=h ) 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 Intel Quick Sync Video hardware acceleration', '*-*-*', none=optparse.SUPPRESS_HELP ).value + grp.add_option( '--enable-qsv', 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 ) @@ -1645,6 +1647,7 @@ int main () doc.add( 'FEATURE.mp4v2', int( options.enable_mp4v2 )) doc.add( 'FEATURE.libmkv', int( options.enable_libmkv )) doc.add( 'FEATURE.avformat', int( options.enable_avformat )) + doc.add( 'FEATURE.qsv', int( options.enable_qsv )) 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 2554c11e7..bf6c5f4ec 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -68,6 +68,10 @@ ifneq ($(HAS.pthread),1) endif endif +ifeq (1,$(FEATURE.qsv)) + MODULES += contrib/libmfx +endif + MODULES += contrib/x264 ifneq (,$(filter $(BUILD.system),cygwin mingw)) |