diff options
| author | jstebbins <[email protected]> | 2014-04-16 21:06:26 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2014-04-16 21:06:26 +0000 |
| commit | d68d469f8e1b42675f6f55c5c04458be0da14c41 (patch) | |
| tree | 11ca053664aecd0787c989a2390ede1fc2c659b7 /contrib | |
| parent | e468d11bb75ab7356bdd3d70c84582eecc471d4b (diff) | |
contrib: fix ffmpeg dependencies to include libvpx
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6167 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ffmpeg/module.defs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index b7d0b07d8..eae74b09c 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -1,8 +1,9 @@ +__deps__ := YASM BZIP2 ZLIB FDKAAC PTHREADW32 LIBMFX LIBVPX 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)) +__deps__ += PTHREADW32 LIBMFX endif + +$(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,$(__deps__))) $(eval $(call import.CONTRIB.defs,FFMPEG)) FFMPEG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libav-v10.tar.bz2 |