mirror of
https://github.com/linuxserver/docker-ffmpeg.git
synced 2026-02-20 04:56:23 +08:00
Merged with master.
This commit is contained in:
Tercio Gaudencio Filho
commit
0142fe0cc1
@ -57,6 +57,7 @@ RUN \
|
||||
gcc \
|
||||
git \
|
||||
gperf \
|
||||
i965-va-driver-shaders \
|
||||
libexpat1-dev \
|
||||
libxext-dev \
|
||||
libxfixes-dev \
|
||||
@ -691,6 +692,7 @@ RUN \
|
||||
libglib2.0-0 \
|
||||
libgomp1 \
|
||||
libharfbuzz0b \
|
||||
libpciaccess0 \
|
||||
libv4l-0 \
|
||||
libwayland-client0 \
|
||||
libx11-6 \
|
||||
|
||||
@ -62,8 +62,9 @@ If an input file is detected we will run FFmpeg as that user/group so the output
|
||||
The image supports Hardware acceleration on x86 pay close attention to the variables for the examples below.
|
||||
|
||||
### Included Intel Drivers (latest versions compiled):
|
||||
- iHD Driver: Supports gen8+
|
||||
- Libva (VAAPI): Supports gen5+ but is limited to gen8+ due to iHD driver
|
||||
- iHD Driver: Supports gen8+ (default for Intel)
|
||||
- i965 Driver: Supports gen5+ (for gen5-gen9.5 it can be enabled by setting env var `LIBVA_DRIVER_NAME=i965` in docker arguments)
|
||||
- Libva (VAAPI): Supports gen5+ with i965 driver and gen8+ with iHD driver
|
||||
- Qsv Dispatcher: OneVPL (supports both OneVPL and MSDK runtimes and should automatically switch)
|
||||
- Qsv Runtime:
|
||||
- OneVPL: Supports gen12+
|
||||
@ -151,6 +152,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **11.08.23:** - Add optional i965 driver for gen5+ support.
|
||||
* **14.06.23:** - Switch to latest iHD for Intel, add qsv support.
|
||||
* **13.06.23:** - Bump to 6.0, update shared libraries, deprecate armhf, combine bin stage.
|
||||
* **14.12.22:** - Rebase to Jammy, bump to 5.1.2.
|
||||
|
||||
@ -8,7 +8,7 @@ bash 5.1-6ubuntu1 deb
|
||||
bsdutils 1:2.37.2-4ubuntu3 deb
|
||||
ca-certificates 20230311ubuntu0.22.04.1 deb
|
||||
coreutils 8.32-4.1ubuntu1 deb
|
||||
curl 7.81.0-1ubuntu1.10 deb
|
||||
curl 7.81.0-1ubuntu1.13 deb
|
||||
dash 0.5.11+git20210903+057cd650a4ed-3build1 deb
|
||||
debconf 1.5.79ubuntu1 deb
|
||||
debianutils 5.5-1ubuntu2 deb
|
||||
@ -17,7 +17,7 @@ dirmngr 2.2.27-3ubuntu2.1 deb
|
||||
dpkg 1.21.1ubuntu2.2 deb
|
||||
e2fsprogs 1.46.5-2ubuntu1.1 deb
|
||||
findutils 4.8.0-1ubuntu3 deb
|
||||
gcc-12-base 12.1.0-2ubuntu1~22.04 deb
|
||||
gcc-12-base 12.3.0-1ubuntu1~22.04 deb
|
||||
gnupg 2.2.27-3ubuntu2.1 deb
|
||||
gnupg-l10n 2.2.27-3ubuntu2.1 deb
|
||||
gnupg-utils 2.2.27-3ubuntu2.1 deb
|
||||
@ -49,20 +49,20 @@ libcap-ng0 0.7.9-2.2build3 deb
|
||||
libcap2 1:2.44-1ubuntu0.22.04.1 deb
|
||||
libcom-err2 1.46.5-2ubuntu1.1 deb
|
||||
libcrypt1 1:4.4.27-1 deb
|
||||
libcurl4 7.81.0-1ubuntu1.10 deb
|
||||
libcurl4 7.81.0-1ubuntu1.13 deb
|
||||
libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb
|
||||
libdebconfclient0 0.261ubuntu1 deb
|
||||
libexpat1 2.4.7-1ubuntu0.2 deb
|
||||
libext2fs2 1.46.5-2ubuntu1.1 deb
|
||||
libffi8 3.4.2-4 deb
|
||||
libfreetype6 2.11.1+dfsg-1ubuntu0.2 deb
|
||||
libgcc-s1 12.1.0-2ubuntu1~22.04 deb
|
||||
libgcc-s1 12.3.0-1ubuntu1~22.04 deb
|
||||
libgcrypt20 1.9.4-3ubuntu3 deb
|
||||
libglib2.0-0 2.72.4-0ubuntu2.2 deb
|
||||
libglib2.0-data 2.72.4-0ubuntu2.2 deb
|
||||
libgmp10 2:6.2.1+dfsg-3ubuntu1 deb
|
||||
libgnutls30 3.7.3-4ubuntu1.2 deb
|
||||
libgomp1 12.1.0-2ubuntu1~22.04 deb
|
||||
libgomp1 12.3.0-1ubuntu1~22.04 deb
|
||||
libgpg-error0 1.43-3 deb
|
||||
libgraphite2-3 1.3.14-1build2 deb
|
||||
libgssapi-krb5-2 1.19.2-2ubuntu0.2 deb
|
||||
@ -78,8 +78,8 @@ libkeyutils1 1.6.1-2ubuntu3 deb
|
||||
libkrb5-3 1.19.2-2ubuntu0.2 deb
|
||||
libkrb5support0 1.19.2-2ubuntu0.2 deb
|
||||
libksba8 1.6.0-2ubuntu0.2 deb
|
||||
libldap-2.5-0 2.5.14+dfsg-0ubuntu0.22.04.2 deb
|
||||
libldap-common 2.5.14+dfsg-0ubuntu0.22.04.2 deb
|
||||
libldap-2.5-0 2.5.15+dfsg-0ubuntu0.22.04.1 deb
|
||||
libldap-common 2.5.15+dfsg-0ubuntu0.22.04.1 deb
|
||||
liblz4-1 1.9.3-2build2 deb
|
||||
liblzma5 5.2.5-2ubuntu1 deb
|
||||
libmd0 1.0.4-1build1 deb
|
||||
@ -96,6 +96,7 @@ libpam-modules 1.4.0-11ubuntu2.3 deb
|
||||
libpam-modules-bin 1.4.0-11ubuntu2.3 deb
|
||||
libpam-runtime 1.4.0-11ubuntu2.3 deb
|
||||
libpam0g 1.4.0-11ubuntu2.3 deb
|
||||
libpciaccess0 0.16-3 deb
|
||||
libpcre2-8-0 10.39-3ubuntu0.1 deb
|
||||
libpcre3 2:8.39-13ubuntu0.22.04.1 deb
|
||||
libpng16-16 1.6.37-3build5 deb
|
||||
@ -116,7 +117,7 @@ libsqlite3-0 3.37.2-2ubuntu0.1 deb
|
||||
libss2 1.46.5-2ubuntu1.1 deb
|
||||
libssh-4 0.9.6-2ubuntu0.22.04.1 deb
|
||||
libssl3 3.0.2-0ubuntu1.10 deb
|
||||
libstdc++6 12.1.0-2ubuntu1~22.04 deb
|
||||
libstdc++6 12.3.0-1ubuntu1~22.04 deb
|
||||
libsystemd0 249.11-0ubuntu3.9 deb
|
||||
libtasn1-6 4.18.0-4build1 deb
|
||||
libtinfo6 6.3-2ubuntu0.1 deb
|
||||
|
||||
@ -65,8 +65,9 @@ full_custom_readme: |
|
||||
The image supports Hardware acceleration on x86 pay close attention to the variables for the examples below.
|
||||
|
||||
### Included Intel Drivers (latest versions compiled):
|
||||
- iHD Driver: Supports gen8+
|
||||
- Libva (VAAPI): Supports gen5+ but is limited to gen8+ due to iHD driver
|
||||
- iHD Driver: Supports gen8+ (default for Intel)
|
||||
- i965 Driver: Supports gen5+ (for gen5-gen9.5 it can be enabled by setting env var `LIBVA_DRIVER_NAME=i965` in docker arguments)
|
||||
- Libva (VAAPI): Supports gen5+ with i965 driver and gen8+ with iHD driver
|
||||
- Qsv Dispatcher: OneVPL (supports both OneVPL and MSDK runtimes and should automatically switch)
|
||||
- Qsv Runtime:
|
||||
- OneVPL: Supports gen12+
|
||||
@ -154,7 +155,7 @@ full_custom_readme: |
|
||||
|
||||
## Versions
|
||||
|
||||
* **03.08.23:** - Added support for WebP formats.
|
||||
* **11.08.23:** - Add optional i965 driver for gen5+ support.
|
||||
* **14.06.23:** - Switch to latest iHD for Intel, add qsv support.
|
||||
* **13.06.23:** - Bump to 6.0, update shared libraries, deprecate armhf, combine bin stage.
|
||||
* **14.12.22:** - Rebase to Jammy, bump to 5.1.2.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user