From 8ceaf281f0f2d119d0053565aa1ec6fac9045fad Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Thu, 9 Jan 2020 15:21:09 -0800 Subject: [PATCH] 4.1.5 (#208) --- docker-images/4.1/alpine/Dockerfile | 2 +- docker-images/4.1/centos/Dockerfile | 2 +- docker-images/4.1/nvidia/Dockerfile | 2 +- docker-images/4.1/scratch/Dockerfile | 2 +- docker-images/4.1/ubuntu/Dockerfile | 2 +- docker-images/4.1/vaapi/Dockerfile | 2 +- docker-images/gitlab-ci.yml | 12 ++++++------ 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docker-images/4.1/alpine/Dockerfile b/docker-images/4.1/alpine/Dockerfile index 3e95ff7e3..cdf524296 100644 --- a/docker-images/4.1/alpine/Dockerfile +++ b/docker-images/4.1/alpine/Dockerfile @@ -18,7 +18,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1.4 \ +ENV FFMPEG_VERSION=4.1.5 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ diff --git a/docker-images/4.1/centos/Dockerfile b/docker-images/4.1/centos/Dockerfile index ce3956b99..4e679d58a 100644 --- a/docker-images/4.1/centos/Dockerfile +++ b/docker-images/4.1/centos/Dockerfile @@ -20,7 +20,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1.4 \ +ENV FFMPEG_VERSION=4.1.5 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ diff --git a/docker-images/4.1/nvidia/Dockerfile b/docker-images/4.1/nvidia/Dockerfile index 1d29c63f5..42b771691 100644 --- a/docker-images/4.1/nvidia/Dockerfile +++ b/docker-images/4.1/nvidia/Dockerfile @@ -35,7 +35,7 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/ffmpeg/lib" ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j12" -ENV FFMPEG_VERSION=4.1.4 \ +ENV FFMPEG_VERSION=4.1.5 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ diff --git a/docker-images/4.1/scratch/Dockerfile b/docker-images/4.1/scratch/Dockerfile index 2ad981a27..1e87a0d65 100644 --- a/docker-images/4.1/scratch/Dockerfile +++ b/docker-images/4.1/scratch/Dockerfile @@ -13,7 +13,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1.4 \ +ENV FFMPEG_VERSION=4.1.5 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ diff --git a/docker-images/4.1/ubuntu/Dockerfile b/docker-images/4.1/ubuntu/Dockerfile index f17e2d4e3..d1985ea84 100644 --- a/docker-images/4.1/ubuntu/Dockerfile +++ b/docker-images/4.1/ubuntu/Dockerfile @@ -21,7 +21,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1.4 \ +ENV FFMPEG_VERSION=4.1.5 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ diff --git a/docker-images/4.1/vaapi/Dockerfile b/docker-images/4.1/vaapi/Dockerfile index ae4d166c7..2e12ad8dc 100644 --- a/docker-images/4.1/vaapi/Dockerfile +++ b/docker-images/4.1/vaapi/Dockerfile @@ -21,7 +21,7 @@ ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib ARG PREFIX=/opt/ffmpeg ARG MAKEFLAGS="-j2" -ENV FFMPEG_VERSION=4.1.4 \ +ENV FFMPEG_VERSION=4.1.5 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ FONTCONFIG_VERSION=2.12.4 \ diff --git a/docker-images/gitlab-ci.yml b/docker-images/gitlab-ci.yml index 32989c974..90ee14574 100644 --- a/docker-images/gitlab-ci.yml +++ b/docker-images/gitlab-ci.yml @@ -71,37 +71,37 @@ snapshot-nvidia: VERSION: "4.2" VARIANT: nvidia -4.1.4-ubuntu: +4.1.5-ubuntu: extends: .docker variables: VERSION: "4.1" VARIANT: ubuntu -4.1.4-alpine: +4.1.5-alpine: extends: .docker variables: VERSION: "4.1" VARIANT: alpine -4.1.4-centos: +4.1.5-centos: extends: .docker variables: VERSION: "4.1" VARIANT: centos -4.1.4-scratch: +4.1.5-scratch: extends: .docker variables: VERSION: "4.1" VARIANT: scratch -4.1.4-vaapi: +4.1.5-vaapi: extends: .docker variables: VERSION: "4.1" VARIANT: vaapi -4.1.4-nvidia: +4.1.5-nvidia: extends: .docker variables: VERSION: "4.1"