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 /contrib/ffmpeg/module.defs | |
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 'contrib/ffmpeg/module.defs')
-rw-r--r-- | contrib/ffmpeg/module.defs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index fdce86fde..6120ff39c 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -1,4 +1,8 @@ +ifeq (1,$(FEATURE.qsv)) +$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,YASM BZIP2 ZLIB FDKAAC PTHREADW32 LIBMFX)) +else $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,YASM BZIP2 ZLIB FDKAAC)) +endif $(eval $(call import.CONTRIB.defs,FFMPEG)) FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v9.6.tar.bz2 @@ -86,6 +90,10 @@ ifeq (none,$(FFMPEG.GCC.O)) FFMPEG.CONFIGURE.extra += --disable-optimizations endif +ifeq (1,$(FEATURE.qsv)) + FFMPEG.CONFIGURE.extra += --enable-qsv +endif + ## enable compile verbosity FFMPEG.BUILD.extra = V=1 |