Skip to content

Commit 814f8b9

Browse files
authored
FFmpeg 7.1 support (shssoichiro#74)
* Add new build-lib features * Update CI to use 7.1 jrottenberg/ffmpeg does not have 7.1 yet * Add libavcodec version for 7.1 * Add FF_API flags for 7.1 * Update crate versions, bump MSRV to 1.65 * Add new audio channel masks * Add new AVColorSpace variants * Add new AVFrameSideDataType variants * Add new AVCodecID variants * Add new AVPacketSideDataType variants
1 parent fd44dd3 commit 814f8b9

File tree

12 files changed

+337
-157
lines changed

12 files changed

+337
-157
lines changed

.github/workflows/build.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,15 @@ jobs:
3030
strategy:
3131
matrix:
3232
ffmpeg_version:
33-
["4.2", "4.3", "4.4", "5.0", "5.1", "6.0", "6.1", "7.0"]
33+
- "4.2"
34+
- "4.3"
35+
- "4.4"
36+
- "5.0"
37+
- "5.1"
38+
- "6.0"
39+
- "6.1"
40+
- "7.0"
41+
- "7.1"
3442
fail-fast: false
3543

3644
steps:
@@ -45,9 +53,9 @@ jobs:
4553
components: rustfmt, clippy
4654
- uses: Swatinem/rust-cache@v2
4755
with:
48-
prefix-key: "v2-rust"
56+
prefix-key: "v3-rust"
4957
# Only save cache for one FFmpeg version
50-
save-if: ${{ matrix.ffmpeg_version == '7.0' }}
58+
save-if: ${{ matrix.ffmpeg_version == '7.1' }}
5159

5260
- name: Check format
5361
run: cargo fmt -- --check
@@ -108,7 +116,7 @@ jobs:
108116
strategy:
109117
matrix:
110118
# GyanD builds don't go as far back as the Ubuntu builds
111-
ffmpeg_version: ["4.4", "5.0", "5.1", "6.0", "6.1", "7.0"]
119+
ffmpeg_version: ["4.4", "5.0", "5.1", "6.0", "6.1", "7.0", "7.1"]
112120
fail-fast: false
113121

114122
env:
@@ -138,8 +146,8 @@ jobs:
138146
components: rustfmt, clippy
139147
- uses: Swatinem/rust-cache@v2
140148
with:
141-
prefix-key: "v2-rust"
142-
save-if: ${{ matrix.ffmpeg_version == '7.0' }}
149+
prefix-key: "v3-rust"
150+
save-if: ${{ matrix.ffmpeg_version == '7.1' }}
143151

144152
- name: Check format
145153
run: cargo fmt -- --check
@@ -167,8 +175,8 @@ jobs:
167175
apt-get update
168176
apt-get install -y --no-install-recommends clang curl pkg-config
169177
# rust-version from Cargo.toml
170-
- name: Install Rust 1.61.0
171-
uses: dtolnay/rust-toolchain@1.61.0
178+
- name: Install Rust 1.65.0
179+
uses: dtolnay/rust-toolchain@1.65.0
172180
- uses: Swatinem/rust-cache@v2
173181
with:
174182
prefix-key: "v2-rust"

0 commit comments

Comments
 (0)