Skip to content

Commit e50cf14

Browse files
committed
Upgrade to ffmpeg 8.1.1
1 parent ea3d2ee commit e50cf14

15 files changed

Lines changed: 210 additions & 217 deletions

.github/workflows/build_base_alpine-rpi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
include:
15-
- ffmpeg_version: "7.1.1"
15+
- ffmpeg_version: "8.1.1"
1616
os: alpine
1717
os_version: "3.23"
1818
platforms: linux/arm64, linux/arm/v7

.github/workflows/build_base_alpine.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
include:
15-
- ffmpeg_version: "7.1.1"
15+
- ffmpeg_version: "8.1.1"
1616
os: alpine
1717
os_version: "3.23"
1818
platforms: linux/amd64,linux/arm64,linux/arm/v7

.github/workflows/build_base_alpine_static.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
include:
15-
- ffmpeg_version: "7.1.1"
15+
- ffmpeg_version: "8.1.1"
1616
os: alpine
1717
os_version: "3.23"
1818
platforms: linux/amd64,linux/arm64,linux/arm/v7

.github/workflows/build_base_ubuntu-cuda.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
platforms: linux/amd64
1919
cuda_version: "12.9.1"
2020
ffnvcodec_version: "12.2.72.0"
21-
ffmpeg_version: "7.1.1"
21+
ffmpeg_version: "8.1.1"
2222
steps:
2323
- name: Get current date
2424
run: |

.github/workflows/build_base_ubuntu-vaapi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
include:
15-
- ffmpeg_version: "7.1.1"
15+
- ffmpeg_version: "8.1.1"
1616
os: ubuntu
1717
os_version: "24.04"
1818
platforms: linux/amd64

Build.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -au
55
function build_default_native() {
66
export OS_NAME=alpine
77
export OS_VERSION=3.23
8-
export FFMPEG_VERSION=7.1.1
8+
export FFMPEG_VERSION=8.1.1
99

1010
docker build \
1111
--progress=plain \
@@ -18,7 +18,7 @@ function build_default_native() {
1818
function build_default() {
1919
export OS_NAME=alpine
2020
export OS_VERSION=3.23
21-
export FFMPEG_VERSION=7.1.1
21+
export FFMPEG_VERSION=8.1.1
2222

2323
docker buildx build \
2424
--load \
@@ -33,7 +33,7 @@ function build_default() {
3333
function build_rpi() {
3434
export OS_NAME=alpine
3535
export OS_VERSION=3.21
36-
export FFMPEG_VERSION=7.1.1
36+
export FFMPEG_VERSION=8.1.1
3737

3838
docker build \
3939
--progress=plain \
@@ -46,7 +46,7 @@ function build_rpi() {
4646
function build_cuda12() {
4747
export OS_NAME=ubuntu
4848
export OS_VERSION=24.04
49-
export FFMPEG_VERSION=7.1.1
49+
export FFMPEG_VERSION=8.1.1
5050
export FFNVCODEC_VERSION=12.2.72.0
5151

5252
docker build \
@@ -62,7 +62,7 @@ function build_cuda12() {
6262
function build_vaapi() {
6363
export OS_NAME=ubuntu
6464
export OS_VERSION=24.04
65-
export FFMPEG_VERSION=7.1.1
65+
export FFMPEG_VERSION=8.1.1
6666

6767
docker buildx build \
6868
--load \

Dockerfile.alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ RUN cd /dist/ffmpeg-${FFMPEG_VERSION} && \
7171
--enable-nonfree \
7272
--enable-gpl \
7373
--enable-version3 \
74-
--enable-postproc \
7574
--enable-static \
7675
--enable-openssl \
7776
--enable-libxml2 \
7877
--enable-libv4l2 \
7978
--enable-v4l2_m2m \
8079
--enable-libfreetype \
80+
--enable-libharfbuzz \
8181
--enable-alsa \
8282
--enable-libsrt \
8383
--enable-libx264 \

Dockerfile.alpine.rpi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ RUN cd /dist/ffmpeg-${FFMPEG_VERSION} && \
7777
--enable-nonfree \
7878
--enable-gpl \
7979
--enable-version3 \
80-
--enable-postproc \
8180
--enable-static \
8281
--enable-openssl \
8382
--enable-libxml2 \
@@ -87,6 +86,7 @@ RUN cd /dist/ffmpeg-${FFMPEG_VERSION} && \
8786
--enable-v4l2_m2m \
8887
--enable-alsa \
8988
--enable-libfreetype \
89+
--enable-libharfbuzz \
9090
--enable-libsrt \
9191
--enable-libx264 \
9292
--enable-libx265 \

Dockerfile.static

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ ENV SRC=/usr \
1212

1313
# Install build dependencies
1414
RUN apk add --no-cache \
15-
autoconf automake bash binutils bzip2 ca-certificates \
16-
cmake coreutils curl diffutils g++ gcc libgcc libtool \
17-
libssl3 linux-headers make musl-dev nasm openssl-dev \
18-
patch tar zlib-dev harfbuzz-dev freetype-dev libxml2-dev \
19-
libsrt-dev x264-dev x265-dev libvpx-dev lame-dev opus-dev \
20-
libvorbis-dev fdk-aac-dev dav1d-dev rav1e-dev aom-dev \
21-
libxcb-dev alsa-lib-dev v4l-utils-dev
15+
autoconf automake bash binutils bzip2 ca-certificates \
16+
cmake coreutils curl diffutils g++ gcc libgcc libtool \
17+
libssl3 linux-headers make musl-dev nasm openssl-dev \
18+
patch tar zlib-dev harfbuzz-dev freetype-dev libxml2-dev \
19+
libsrt-dev x264-dev x265-dev libvpx-dev lame-dev opus-dev \
20+
libvorbis-dev fdk-aac-dev dav1d-dev rav1e-dev aom-dev \
21+
libxcb-dev alsa-lib-dev v4l-utils-dev
2222

2323
WORKDIR /tmp
2424

@@ -34,36 +34,35 @@ RUN cd ffmpeg-${FFMPEG_VERSION} && \
3434
patch -p1 < /contrib/ffmpeg-jsonstats.patch && \
3535
patch -p1 < /contrib/ffmpeg-hls.patch && \
3636
./configure \
37-
--extra-version="datarhei-${BUILD_COMMIT}-${BUILD_DATE}" \
38-
--prefix="${SRC}" \
39-
--extra-libs="-lpthread -lxml2 -lm -lsupc++ -lstdc++ -lssl -lcrypto -lz -lc -ldl" \
40-
--enable-nonfree \
41-
--enable-gpl \
42-
--enable-version3 \
43-
--enable-postproc \
44-
--enable-static \
45-
--disable-shared \
46-
--disable-ffplay \
47-
--disable-debug \
48-
--disable-doc \
49-
--enable-openssl \
50-
--enable-libxml2 \
51-
--enable-libv4l2 \
52-
--enable-v4l2_m2m \
53-
--enable-libfreetype \
54-
--enable-alsa \
55-
--enable-libsrt \
56-
--enable-libx264 \
57-
--enable-libx265 \
58-
--enable-libvpx \
59-
--enable-libmp3lame \
60-
--enable-libopus \
61-
--enable-libvorbis \
62-
--enable-libfdk-aac \
63-
--enable-libdav1d \
64-
--enable-librav1e \
65-
--enable-libaom \
66-
--enable-libxcb && \
37+
--extra-version="datarhei-${BUILD_COMMIT}-${BUILD_DATE}" \
38+
--prefix="${SRC}" \
39+
--extra-libs="-lpthread -lxml2 -lm -lsupc++ -lstdc++ -lssl -lcrypto -lz -lc -ldl" \
40+
--enable-nonfree \
41+
--enable-gpl \
42+
--enable-version3 \
43+
--enable-static \
44+
--disable-shared \
45+
--disable-ffplay \
46+
--disable-debug \
47+
--disable-doc \
48+
--enable-openssl \
49+
--enable-libxml2 \
50+
--enable-libv4l2 \
51+
--enable-v4l2_m2m \
52+
--enable-libfreetype \
53+
--enable-alsa \
54+
--enable-libsrt \
55+
--enable-libx264 \
56+
--enable-libx265 \
57+
--enable-libvpx \
58+
--enable-libmp3lame \
59+
--enable-libopus \
60+
--enable-libvorbis \
61+
--enable-libfdk-aac \
62+
--enable-libdav1d \
63+
--enable-librav1e \
64+
--enable-libaom \
65+
--enable-libxcb && \
6766
make && make install
6867

6968
# Output stage (nur statische Binarys)

Dockerfile.ubuntu.cuda11

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ RUN cd /dist/ffmpeg-${FFMPEG_VERSION} && \
195195
--enable-nonfree \
196196
--enable-gpl \
197197
--enable-version3 \
198-
--enable-postproc \
199198
--enable-static \
200199
--enable-openssl \
201200
--enable-libxml2 \

0 commit comments

Comments
 (0)