summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-01-27 09:22:52 +0100
committerwm4 <wm4@nowhere>2017-01-27 09:22:52 +0100
commita9e0f4b2793091991dfca4fba715f7a6635e797d (patch)
tree4edfadc96e2dd9eb98aa8a53a88371ec09a85d92
parentc3205d294e519f994829d9355eb133670729aab4 (diff)
downloadmpv-a9e0f4b2793091991dfca4fba715f7a6635e797d.tar.bz2
mpv-a9e0f4b2793091991dfca4fba715f7a6635e797d.tar.xz
wscript: merge libavfilter check into the main ffmpeg check
It used to be optional. That's why it was separate. No need for that anymore.
-rw-r--r--wscript9
1 files changed, 2 insertions, 7 deletions
diff --git a/wscript b/wscript
index 6ebc3f9fd0..0986f8dc40 100644
--- a/wscript
+++ b/wscript
@@ -405,7 +405,8 @@ libav_pkg_config_checks = [
'libavutil', '>= 55.20.0',
'libavcodec', '>= 57.25.0',
'libavformat', '>= 57.07.0',
- 'libswscale', '>= 4.0.0'
+ 'libswscale', '>= 4.0.0',
+ 'libavfilter', '>= 6.7.0',
]
libav_versions_string = "FFmpeg 3.2.2 or Libav 12"
@@ -434,12 +435,6 @@ FFmpeg/Libav libraries. You need at least {0}. Aborting.".format(libav_versions_
'req': True,
'fmsg': 'No resampler found. Install libavresample or libswresample (FFmpeg).'
}, {
- 'name': 'libavfilter',
- 'desc': 'libavfilter',
- 'func': check_pkg_config('libavfilter', '>= 6.7.0'),
- 'req': True,
- 'fmsg': 'libavfilter is a required dependency.',
- }, {
'name': '--libavdevice',
'desc': 'libavdevice',
'func': check_pkg_config('libavdevice', '>= 57.0.0'),