Skip to content

Commit a13516c

Browse files
authored
Update to FFmpeg 7.1 (#89)
* Prepare for ffmpeg 7.1 * Update for 7.1 * Update versions
1 parent cea2867 commit a13516c

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
container: jrottenberg/ffmpeg:${{ matrix.ffmpeg_version }}-ubuntu
1212
strategy:
1313
matrix:
14-
ffmpeg_version: ['3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1', '6.0', '6.1']
14+
ffmpeg_version: ['3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1', '6.0', '6.1', '7.0']
1515
fail-fast: false
1616
env:
1717
FEATURES: avcodec,avdevice,avfilter,avformat,postproc,swresample,swscale
@@ -39,24 +39,24 @@ jobs:
3939
- name: Check format
4040
run: |
4141
cargo fmt -- --check
42-
# Added only because there is no ffmpeg7.0 docker image here yet
42+
# Added only because there is no ffmpeg7.1 docker image here yet
4343
# https://github.com/jrottenberg/ffmpeg
4444
# Note that postproc feature is not tested here
45-
build-test-lint-7-0:
46-
name: FFmpeg 7.0 - build, test and lint
45+
build-test-lint-7-1:
46+
name: FFmpeg 7.1 - build, test and lint
4747
runs-on: ubuntu-latest
4848
strategy:
4949
fail-fast: false
5050
env:
5151
FEATURES: avcodec,avdevice,avfilter,avformat,swresample,swscale #,postproc
52-
FFMPEG_DIR: /home/runner/work/rust-ffmpeg-sys/rust-ffmpeg-sys/ffmpeg-7.0-linux-clang-default
52+
FFMPEG_DIR: /home/runner/work/rust-ffmpeg-sys/rust-ffmpeg-sys/ffmpeg-7.1-linux-clang-default
5353
steps:
5454
- uses: actions/checkout@v2
5555
- name: Install dependencies
5656
run: |
5757
sudo apt update
5858
sudo apt install -y --no-install-recommends clang curl pkg-config xz-utils
59-
curl -L https://sourceforge.net/projects/avbuild/files/linux/ffmpeg-7.0-linux-clang-default.tar.xz/download -o ffmpeg.tar.xz
59+
curl -L https://sourceforge.net/projects/avbuild/files/linux/ffmpeg-7.1-linux-clang-default.tar.xz/download -o ffmpeg.tar.xz
6060
tar -xf ffmpeg.tar.xz
6161
pwd
6262
- name: Set up Rust

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "ffmpeg-sys-next"
3-
version = "7.0.3"
3+
version = "7.1.0"
44
build = "build.rs"
55
links = "ffmpeg"
66

@@ -20,9 +20,9 @@ libc = "0.2"
2020

2121
[build-dependencies]
2222
num_cpus = "1.16"
23-
cc = "1.0"
23+
cc = "1.1"
2424
pkg-config = "0.3"
25-
bindgen = { version = "0.69", default-features = false, features = ["runtime"] }
25+
bindgen = { version = "0.70", default-features = false, features = ["runtime"] }
2626

2727
[target.'cfg(target_env = "msvc")'.build-dependencies]
2828
vcpkg = "0.2"

build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -612,6 +612,7 @@ fn check_features(
612612
("ffmpeg_6_0", 60, 3),
613613
("ffmpeg_6_1", 60, 31),
614614
("ffmpeg_7_0", 61, 3),
615+
("ffmpeg_7_1", 61, 19),
615616
];
616617
for &(ffmpeg_version_flag, lavc_version_major, lavc_version_minor) in
617618
ffmpeg_lavc_versions.iter()

0 commit comments

Comments
 (0)