Skip to content

Commit

Permalink
7.0.1 (#392)
Browse files Browse the repository at this point in the history
FFmpeg 7.0.1 "Dijkstra"
7.0.1 was released on 2024-05-26. It is the latest stable FFmpeg release from the 7.0 release branch, which was cut from master on 2024-03-27.
  • Loading branch information
jrottenberg authored May 30, 2024
1 parent 416b0ca commit 06c36cb
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion docker-images/7.0/alpine313/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FROM base AS build

WORKDIR /tmp/workdir

ENV FFMPEG_VERSION=7.0 \
ENV FFMPEG_VERSION=7.0.1 \
AOM_VERSION=v3.8.1 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/7.0/nvidia2204/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ FROM devel-base as build

ENV NVIDIA_HEADERS_VERSION=11.1.5.3

ENV FFMPEG_VERSION=7.0 \
ENV FFMPEG_VERSION=7.0.1 \
AOM_VERSION=v3.8.1 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/7.0/scratch313/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM alpine:3.13 AS build

WORKDIR /tmp/workdir

ENV FFMPEG_VERSION=7.0 \
ENV FFMPEG_VERSION=7.0.1 \
AOM_VERSION=v3.8.1 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/7.0/ubuntu2204/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get -yqq update && \

FROM base as build

ENV FFMPEG_VERSION=7.0 \
ENV FFMPEG_VERSION=7.0.1 \
AOM_VERSION=v3.8.1 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/7.0/vaapi2204/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get -yqq update && \

FROM base as build

ENV FFMPEG_VERSION=7.0 \
ENV FFMPEG_VERSION=7.0.1 \
AOM_VERSION=v3.8.1 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
20 changes: 10 additions & 10 deletions docker-images/azure-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,46 +8,46 @@ jobs:
maxParallel: 10
matrix:

ubuntu2204_7.0:
ubuntu2204_7.0.1:
MAJOR_VERSION: 7
VERSION: 7.0
LONG_VERSION: 7.0
LONG_VERSION: 7.0.1
VARIANT: ubuntu2204
PARENT: ubuntu
ISPARENT: True


alpine313_7.0:
alpine313_7.0.1:
MAJOR_VERSION: 7
VERSION: 7.0
LONG_VERSION: 7.0
LONG_VERSION: 7.0.1
VARIANT: alpine313
PARENT: alpine
ISPARENT: True


scratch313_7.0:
scratch313_7.0.1:
MAJOR_VERSION: 7
VERSION: 7.0
LONG_VERSION: 7.0
LONG_VERSION: 7.0.1
VARIANT: scratch313
PARENT: scratch
ISPARENT: True


vaapi2204_7.0:
vaapi2204_7.0.1:
MAJOR_VERSION: 7
VERSION: 7.0
LONG_VERSION: 7.0
LONG_VERSION: 7.0.1
VARIANT: vaapi2204
PARENT: vaapi
ISPARENT: True


nvidia2204_7.0:
nvidia2204_7.0.1:
MAJOR_VERSION: 7
VERSION: 7.0
LONG_VERSION: 7.0
LONG_VERSION: 7.0.1
VARIANT: nvidia2204
PARENT: nvidia
ISPARENT: True
Expand Down
20 changes: 10 additions & 10 deletions docker-images/gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,57 +6,57 @@ stages:
- ubuntu
- vaapi

7.0-ubuntu2204:
7.0.1-ubuntu2204:
extends: .docker
stage: ubuntu
variables:
MAJOR_VERSION: 7
VERSION: "7.0"
LONG_VERSION: "7.0"
LONG_VERSION: "7.0.1"
VARIANT: ubuntu2204
PARENT: "ubuntu"
ISPARENT: "True"

7.0-alpine313:
7.0.1-alpine313:
extends: .docker
stage: alpine
variables:
MAJOR_VERSION: 7
VERSION: "7.0"
LONG_VERSION: "7.0"
LONG_VERSION: "7.0.1"
VARIANT: alpine313
PARENT: "alpine"
ISPARENT: "True"

7.0-scratch313:
7.0.1-scratch313:
extends: .docker
stage: scratch
variables:
MAJOR_VERSION: 7
VERSION: "7.0"
LONG_VERSION: "7.0"
LONG_VERSION: "7.0.1"
VARIANT: scratch313
PARENT: "scratch"
ISPARENT: "True"

7.0-vaapi2204:
7.0.1-vaapi2204:
extends: .docker
stage: vaapi
variables:
MAJOR_VERSION: 7
VERSION: "7.0"
LONG_VERSION: "7.0"
LONG_VERSION: "7.0.1"
VARIANT: vaapi2204
PARENT: "vaapi"
ISPARENT: "True"

7.0-nvidia2204:
7.0.1-nvidia2204:
extends: .docker
stage: nvidia
variables:
MAJOR_VERSION: 7
VERSION: "7.0"
LONG_VERSION: "7.0"
LONG_VERSION: "7.0.1"
VARIANT: nvidia2204
PARENT: "nvidia"
ISPARENT: "True"
Expand Down

0 comments on commit 06c36cb

Please sign in to comment.