diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-22 21:11:18 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-22 21:11:18 +0100 |
| commit | f0edd6ab35c3c2b7800a26ec8206adab75e5f633 (patch) | |
| tree | aad6fc8ca2d932bcc630254e339fd648d8a10f50 /wscript | |
| parent | 6d26c4afe1e2b63d346d311ceffe41bf8cb62572 (diff) | |
| parent | 14b1f672dc92ae8e1385c75e30420a4dcb4e32c9 (diff) | |
Merge master.
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -33,6 +33,8 @@ def static_ffmpeg(conf): conf.env.STLIB_SWSCALE = ['swscale'] conf.check_cfg(package='libswresample', args='--cflags', uselib_store='SWRESAMPLE', mandatory=True) conf.env.STLIB_SWRESAMPLE = ['swresample'] + conf.check_cfg(package='libpostproc', args='--cflags', uselib_store='POSTPROC', mandatory=True) + conf.env.STLIB_POSTPROC = ['postproc'] def dynamic_ffmpeg(conf): conf.check_cfg(package='libavformat', args='--cflags --libs', uselib_store='AVFORMAT', mandatory=True) @@ -41,6 +43,7 @@ def dynamic_ffmpeg(conf): conf.check_cfg(package='libavutil', args='--cflags --libs', uselib_store='AVUTIL', mandatory=True) conf.check_cfg(package='libswscale', args='--cflags --libs', uselib_store='SWSCALE', mandatory=True) conf.check_cfg(package='libswresample', args='--cflags --libs', uselib_store='SWRESAMPLE', mandatory=True) + conf.check_cfg(package='libpostproc', args='--cflags --libs', uselib_store='POSTPROC', mandatory=True) def static_openjpeg(conf): conf.check_cfg(package='libopenjpeg', args='--cflags', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True) |