diff options
| author | Rainer Hochecker <fernetmenta@online.de> | 2018-04-17 20:24:09 +0200 |
|---|---|---|
| committer | Rainer Hochecker <fernetmenta@online.de> | 2018-04-19 08:37:44 +0200 |
| commit | c7e2acc1b2ee781af6e14d80da0edd0aa23bdf03 (patch) | |
| tree | 97c98bef3613eb34ac12650d0e1f04683e1cf390 /tools/buildsteps/windows | |
| parent | af4a5489295496d5f7dcabe097a263f08199494b (diff) | |
bump ffmpeg to 4.0
Diffstat (limited to 'tools/buildsteps/windows')
3 files changed, 5 insertions, 5 deletions
diff --git a/tools/buildsteps/windows/make-mingwlibs.sh b/tools/buildsteps/windows/make-mingwlibs.sh index e7d3bd6ac3..2f7cdd36fb 100644 --- a/tools/buildsteps/windows/make-mingwlibs.sh +++ b/tools/buildsteps/windows/make-mingwlibs.sh @@ -98,7 +98,7 @@ echo "-------------------------------------------------" echo " building FFmpeg $TRIPLET" echo "-------------------------------------------------" ./buildffmpeg.sh $MAKECLEAN -checkfiles avcodec-57.dll avformat-57.dll avutil-55.dll postproc-54.dll swscale-4.dll avfilter-6.dll swresample-2.dll +checkfiles avcodec-58.dll avformat-58.dll avutil-56.dll postproc-55.dll swscale-5.dll avfilter-7.dll swresample-3.dll echo "-------------------------------------------------" echo " building of FFmpeg $TRIPLET done..." echo "-------------------------------------------------" diff --git a/tools/buildsteps/windows/patches/0001-ffmpeg-detect-openssl.patch b/tools/buildsteps/windows/patches/0001-ffmpeg-detect-openssl.patch index b7086f98a3..a5d45799ae 100644 --- a/tools/buildsteps/windows/patches/0001-ffmpeg-detect-openssl.patch +++ b/tools/buildsteps/windows/patches/0001-ffmpeg-detect-openssl.patch @@ -12,14 +12,14 @@ diff --git a/configure b/configure index a1818dc..1cf2a7c 100755 --- a/configure +++ b/configure -@@ -6075,6 +6075,7 @@ +@@ -6124,6 +6124,7 @@ check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto || check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 || check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 || + check_lib openssl openssl/ssl.h SSL_library_init -llibeay32 -lssleay32 || die "ERROR: openssl not found"; } - enabled rkmpp && { { require_pkg_config rockchip_mpp rockchip_mpp rockchip/rk_mpi.h mpp_create || - die "ERROR : Rockchip MPP was not found."; } && + enabled rkmpp && { require_pkg_config rkmpp rockchip_mpp rockchip/rk_mpi.h mpp_create && + require_pkg_config rockchip_mpp "rockchip_mpp >= 1.3.7" rockchip/rk_mpi.h mpp_create && -- 2.10.1.windows.1 diff --git a/tools/buildsteps/windows/patches/0002-ffmpeg-zlib-config-conflict.patch b/tools/buildsteps/windows/patches/0002-ffmpeg-zlib-config-conflict.patch index 6473e92f9f..28d86ee73b 100644 --- a/tools/buildsteps/windows/patches/0002-ffmpeg-zlib-config-conflict.patch +++ b/tools/buildsteps/windows/patches/0002-ffmpeg-zlib-config-conflict.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -7038,6 +7038,9 @@ +@@ -7143,6 +7143,9 @@ $CONFIG_EXTRA \ $ALL_COMPONENTS \ |