From 545e363109a0c762a9ee4d55c0cce09a75865a1c Mon Sep 17 00:00:00 2001 From: thelamer Date: Tue, 16 Jun 2020 23:58:33 -0700 Subject: [PATCH] bump to 4.3 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- Jenkinsfile | 2 +- jenkins-vars.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 77543b8..6a61216 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ENV \ ENV \ AOM=v1.0.0 \ FDKAAC=2.0.1 \ - FFMPEG_HARD=4.2.2 \ + FFMPEG_HARD=4.3 \ FONTCONFIG=2.13.92 \ FREETYPE=2.9.1 \ FRIBIDI=1.0.8 \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 3075b08..bd67daf 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -12,7 +12,7 @@ ENV \ ENV \ AOM=v1.0.0 \ FDKAAC=2.0.1 \ - FFMPEG_HARD=4.2.2 \ + FFMPEG_HARD=4.3 \ FREETYPE=2.9.1 \ FRIBIDI=1.0.8 \ KVAZAAR=1.3.0 \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 17208ef..7fc304e 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -12,7 +12,7 @@ ENV \ ENV \ AOM=v1.0.0 \ FDKAAC=2.0.1 \ - FFMPEG_HARD=4.2.2 \ + FFMPEG_HARD=4.3 \ FREETYPE=2.9.1 \ FRIBIDI=1.0.8 \ KVAZAAR=1.3.0 \ diff --git a/Jenkinsfile b/Jenkinsfile index a4b0466..6521dde 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,7 +96,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' echo 4.2.2 ''', + script: ''' echo 4.3 ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 99f99ce..9025941 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,7 +3,7 @@ # jenkins variables project_name: docker-ffmpeg external_type: na -custom_version_command: "echo 4.2.2" +custom_version_command: "echo 4.3" release_type: prerelease release_tag: bin ls_branch: bin