diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index dcda628..35dd57b 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -20,7 +20,7 @@ jobs: echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_FFMPEG_MASTER\". ****" echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_FFMPEG_MASTER\`" >> $GITHUB_STEP_SUMMARY echo "**** Retrieving external version ****" - EXT_RELEASE=$(echo 6.0-cli) + EXT_RELEASE=$(echo 6.1-cli) if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" FAILURE_REASON="Can't retrieve external version for ffmpeg branch master" diff --git a/Dockerfile b/Dockerfile index b2fbb12..c606e19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ENV \ ENV \ AOM=v3.7.0 \ FDKAAC=2.0.2 \ - FFMPEG_HARD=6.0 \ + FFMPEG_HARD=6.1 \ FONTCONFIG=2.14.2 \ FREETYPE=2.13.2 \ FRIBIDI=1.0.13 \ @@ -31,7 +31,7 @@ ENV \ LIBVIDSTAB=1.1.1 \ LIBVMAF=2.3.1 \ LIBVPL=2023.3.1 \ - NVCODEC=n12.0.16.0 \ + NVCODEC=n12.1.14.0 \ OGG=1.3.5 \ ONEVPL=23.2.4 \ OPENCOREAMR=0.1.6 \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 48b06a2..e9c9708 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -15,7 +15,7 @@ ENV \ ENV \ AOM=v3.7.0 \ FDKAAC=2.0.2 \ - FFMPEG_HARD=6.0 \ + FFMPEG_HARD=6.1 \ FREETYPE=2.13.2 \ FRIBIDI=1.0.13 \ KVAZAAR=2.2.0 \ @@ -25,7 +25,7 @@ ENV \ LIBVA=2.19.0 \ LIBVDPAU=1.5 \ LIBVIDSTAB=1.1.1 \ - NVCODEC=n12.0.16.0 \ + NVCODEC=n12.1.14.0 \ OGG=1.3.5 \ OPENCOREAMR=0.1.6 \ OPENJPEG=2.5.0 \ diff --git a/Jenkinsfile b/Jenkinsfile index 584dbca..4532da9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -102,7 +102,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' echo 6.0-cli ''', + script: ''' echo 6.1-cli ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/README.md b/README.md index b001a6f..f8bf410 100644 --- a/README.md +++ b/README.md @@ -151,6 +151,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **13.11.23:** - Bump FFmpeg to 6.1. * **02.11.23:** - Remove `--enable-small` from ffmpeg build options to add back some features. * **05.10.23:** - Add support for SVT-AV1. Update various libraries. * **16.08.23:** - Added support for WebP formats. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 7508d25..1cbaee9 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 6.0-cli" +custom_version_command: "echo 6.1-cli" release_type: stable release_tag: latest ls_branch: master diff --git a/readme-vars.yml b/readme-vars.yml index 9f51688..ad9196c 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -155,6 +155,7 @@ full_custom_readme: | ## Versions + * **13.11.23:** - Bump FFmpeg to 6.1. * **02.11.23:** - Remove `--enable-small` from ffmpeg build options to add back some features. * **05.10.23:** - Add support for SVT-AV1. Update various libraries. * **16.08.23:** - Added support for WebP formats.