summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml1
-rwxr-xr-xold-configure10
-rw-r--r--wscript12
3 files changed, 11 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml
index faafe27b86..a1650a0cee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
language: c
env:
- - LIBAV=libav-stable
- LIBAV=libav-git
- LIBAV=ffmpeg-stable
- LIBAV=ffmpeg-git
diff --git a/old-configure b/old-configure
index 06f9ee16e1..56b4cdfbdb 100755
--- a/old-configure
+++ b/old-configure
@@ -2654,7 +2654,7 @@ fi
echores "$_lcms2"
-all_libav_libs="libavutil >= 52.3.0:libavcodec > 54.34.0:libavformat > 54.19.0:libswscale >= 2.0.0"
+all_libav_libs="libavutil >= 52.48.101:libavcodec >= 55.34.1:libavformat >= 55.12.0:libswscale >= 2.1.2"
echocheck "Libav ($all_libav_libs)"
if test "$ffmpeg" = auto ; then
IFS=":" # shell should not be used for programming
@@ -2673,9 +2673,9 @@ _avresample_has_set_channel_mapping=no
def_libswresample='#define HAVE_LIBSWRESAMPLE 0'
def_libavresample='#define HAVE_LIBAVRESAMPLE 0'
-echocheck "libavresample >= 1.0.0"
+echocheck "libavresample >= 1.1.0"
if test "$_disable_avresample" = no ; then
- if pkg_config_add "libavresample >= 1.0.0" ; then
+ if pkg_config_add "libavresample >= 1.1.0" ; then
_resampler=yes
_avresample=yes
def_libavresample='#define HAVE_LIBAVRESAMPLE 1'
@@ -2691,8 +2691,8 @@ fi
if test "$_resampler" = no ; then
- echocheck "libswresample >= 0.17.102"
- if pkg_config_add "libswresample >= 0.17.102" ; then
+ echocheck "libswresample >= 0.17.104"
+ if pkg_config_add "libswresample >= 0.17.104" ; then
_resampler=yes
def_libswresample='#define HAVE_LIBSWRESAMPLE 1'
fi
diff --git a/wscript b/wscript
index 00bba48629..1e71adf355 100644
--- a/wscript
+++ b/wscript
@@ -325,10 +325,10 @@ If you really mean to compile without libass support use --disable-libass."
]
libav_pkg_config_checks = [
- 'libavutil', '>= 52.3.0',
- 'libavcodec', '> 54.34.0',
- 'libavformat', '> 54.19.0',
- 'libswscale', '>= 2.0.0'
+ 'libavutil', '>= 52.48.101',
+ 'libavcodec', '>= 55.34.1',
+ 'libavformat', '>= 55.12.0',
+ 'libswscale', '>= 2.1.2'
]
libav_dependencies = [
@@ -342,7 +342,7 @@ Libav libraries ({0}). Aborting.".format(" ".join(libav_pkg_config_checks))
}, {
'name': '--libavresample',
'desc': 'libavresample',
- 'func': check_pkg_config('libavresample', '>= 1.0.0'),
+ 'func': check_pkg_config('libavresample', '>= 1.1.0'),
}, {
'name': 'avresample-set-channel-mapping',
'desc': 'libavresample channel mapping API',
@@ -353,7 +353,7 @@ Libav libraries ({0}). Aborting.".format(" ".join(libav_pkg_config_checks))
}, {
'name': '--libswresample',
'desc': 'libswresample',
- 'func': check_pkg_config('libswresample', '>= 0.17.102'),
+ 'func': check_pkg_config('libswresample', '>= 0.17.104'),
'deps_neg': ['libavresample'],
}, {
'name': 'resampler',