LAB-linuxserver/docker-ffmpeg
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-ffmpeg.git synced 2026-02-20 04:56:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45 from linuxserver/6.1

Browse Source 
Bump FFmpeg to 6.1
This commit is contained in:
aptalca 2023-11-13 15:42:14 -05:00 committed by GitHub
commit 5091d851b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/external_trigger.yml vendored
View File

@ -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"

4
Dockerfile
View File

@ -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 \

4
Dockerfile.aarch64
View File

@ -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 \

2
Jenkinsfile vendored
View File

@ -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'
}

1
README.md
View File

@ -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.

2
jenkins-vars.yml
View File

@ -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

1
readme-vars.yml
View File

@ -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.