diff options
author | wm4 <wm4@nowhere> | 2016-12-07 18:17:41 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-12-07 19:13:14 +0100 |
commit | a660e15c9b96bd46209e78b3c3d4cf136a039a50 (patch) | |
tree | cc3b8bd70895f057fc0d8b095e891346b967faef | |
parent | 2b1d150a53d328db092c8f3799667cd72ef89634 (diff) | |
download | mpv-a660e15c9b96bd46209e78b3c3d4cf136a039a50.tar.bz2 mpv-a660e15c9b96bd46209e78b3c3d4cf136a039a50.tar.xz |
build: bump required minimum versions to FFmpeg 3.2.2 and Libav 12
Fixes the build with Libav 11 (not).
-rw-r--r-- | README.md | 2 | ||||
-rwxr-xr-x | TOOLS/travis-deps | 4 | ||||
-rw-r--r-- | wscript | 33 |
3 files changed, 27 insertions, 12 deletions
@@ -95,7 +95,7 @@ Essential dependencies (incomplete list): - Audio output development headers (libasound/ALSA, pulseaudio) - FFmpeg libraries (libavutil libavcodec libavformat libswscale libavfilter and either libswresample or libavresample) - At least FFmpeg 2.4.0 or Libav 11 is required. + At least FFmpeg 3.2.2 or Libav 12 is required. - zlib - iconv (normally provided by the system libc) - libass (OSD, OSC, text subtitles) diff --git a/TOOLS/travis-deps b/TOOLS/travis-deps index 20825568b0..1d97f446b9 100755 --- a/TOOLS/travis-deps +++ b/TOOLS/travis-deps @@ -89,7 +89,7 @@ class Libav < TravisDepsBuilder { "libav-stable" => { :action => :stable, - :url => 'http://libav.org/releases/libav-11.tar.gz' + :url => 'http://libav.org/releases/libav-12.tar.gz' }, "libav-git" => { :action => :git, @@ -97,7 +97,7 @@ class Libav < TravisDepsBuilder }, "ffmpeg-stable" => { :action => :stable, - :url => 'http://www.ffmpeg.org/releases/ffmpeg-2.4.tar.gz' + :url => 'http://www.ffmpeg.org/releases/ffmpeg-3.2.2.tar.gz' }, "ffmpeg-git" => { :action => :git, @@ -401,13 +401,28 @@ iconv support use --disable-iconv.", } ] +# Libav 12: +# libavutil 55.20.0 +# libavcodec 57.25.0 +# libavformat 57.7.2 +# libswscale 4.0.0 +# libavfilter 6.7.0 +# libavresample 3.0.0 +# FFmpeg 3.2.2: +# libavutil 55.34.100 +# libavcodec 57.64.101 +# libavformat 57.56.100 +# libswscale 4.2.100 +# libavfilter 6.65.100 +# libswresample 2.3.100 + libav_pkg_config_checks = [ - 'libavutil', '>= 54.02.0', - 'libavcodec', '>= 56.1.0', - 'libavformat', '>= 56.01.0', - 'libswscale', '>= 2.1.3' + 'libavutil', '>= 55.20.0', + 'libavcodec', '>= 57.25.0', + 'libavformat', '>= 57.07.0', + 'libswscale', '>= 4.0.0' ] -libav_versions_string = "FFmpeg 2.4 or Libav 11" +libav_versions_string = "FFmpeg 3.2.2 or Libav 12" libav_dependencies = [ { @@ -420,11 +435,11 @@ FFmpeg/Libav libraries. You need at least {0}. Aborting.".format(libav_versions_ }, { 'name': '--libswresample', 'desc': 'libswresample', - 'func': check_pkg_config('libswresample', '>= 1.1.100'), + 'func': check_pkg_config('libswresample', '>= 2.3.100'), }, { 'name': '--libavresample', 'desc': 'libavresample', - 'func': check_pkg_config('libavresample', '>= 2.1.0'), + 'func': check_pkg_config('libavresample', '>= 3.0.0'), 'deps_neg': ['libswresample'], }, { 'name': 'resampler', @@ -436,13 +451,13 @@ FFmpeg/Libav libraries. You need at least {0}. Aborting.".format(libav_versions_ }, { 'name': 'libavfilter', 'desc': 'libavfilter', - 'func': check_pkg_config('libavfilter', '>= 5.0.0'), + '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', '>= 55.0.0'), + 'func': check_pkg_config('libavdevice', '>= 57.0.0'), }, { 'name': 'avcodec-chroma-pos-api', 'desc': 'libavcodec avcodec_enum_to_chroma_pos API', |