Skip to content

Commit 7df2287

Browse files
Merge branch 'release/v1.8.0' into claude/text-block-padding-centering-865284
2 parents a336449 + 7171903 commit 7df2287

4 files changed

Lines changed: 21 additions & 21 deletions

File tree

THIRD-PARTY-NOTICES.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ distributed by their own registries, not redistributed inside our binaries.
2626
verifies this before vendoring — it reads `ffmpeg -L`, `-buildconf` and
2727
`-encoders` and refuses any binary that reports otherwise.
2828
- **Upstream binaries**: BtbN/FFmpeg-Builds, release
29-
`autobuild-2026-07-15-14-01`, the `*-lgpl-shared-8.1` assets. Pinned by
29+
`autobuild-2026-07-30-13-32`, the `*-lgpl-shared-8.1` assets. Pinned by
3030
SHA-256 in `scripts/fetch-ffmpeg.mjs`; the digests there identify the exact
3131
artifacts we ship.
32-
<https://github.com/BtbN/FFmpeg-Builds/releases/tag/autobuild-2026-07-15-14-01>
33-
- **Corresponding source**: FFmpeg n8.1.2, commit `94138f6973`, from
32+
<https://github.com/BtbN/FFmpeg-Builds/releases/tag/autobuild-2026-07-30-13-32>
33+
- **Corresponding source**: FFmpeg n8.1.2, commit `cfa62de001`, from
3434
<https://github.com/FFmpeg/FFmpeg>. The build configuration and scripts that
3535
produced these exact binaries are published at
3636
<https://github.com/BtbN/FFmpeg-Builds>.

crates/.cargo/config.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# ffmpeg LGPL-shared (voir README). LIBCLANG_PATH = install LLVM locale (bindgen).
33
# Ces valeurs cèdent à une vraie variable d'environnement (force=false par défaut).
44
#
5-
# Pinné sur le MÊME build release-branch (n8.1.2-22-g94138f6973, tag BtbN
6-
# autobuild-2026-07-15-14-01) que scripts/fetch-ffmpeg.mjs vendorise dans
5+
# Pinné sur le MÊME build release-branch (n8.1.2-32-gcfa62de001, tag BtbN
6+
# autobuild-2026-07-30-13-32) que scripts/fetch-ffmpeg.mjs vendorise dans
77
# electron/native/bin/<tag>/ pour le packaging — pas un snapshot "master-latest"
88
# flottant. L'addon (compositor-view-napi) doit être lié à la même version de
99
# ffmpeg que celle shippée, sinon les DLLs vendorisées ne matchent pas les

scripts/fetch-ffmpeg.mjs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,47 +66,47 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
6666
const ROOT = path.join(__dirname, "..");
6767

6868
/** Immutable dated tag. `latest` is an alias that moves — do not use it here. */
69-
const RELEASE_TAG = "autobuild-2026-07-15-14-01";
69+
const RELEASE_TAG = "autobuild-2026-07-30-13-32";
7070
const BASE = `https://github.com/BtbN/FFmpeg-Builds/releases/download/${RELEASE_TAG}`;
7171

7272
/** Tag, asset and digest move together. Re-pin all three or none. */
7373
const PINNED = {
7474
"win32-x64": {
75-
asset: "ffmpeg-n8.1.2-22-g94138f6973-win64-lgpl-8.1.zip",
76-
sha256: "6bd644cb9476a72d905ba22c807eaef1c47a224c8f194c0771da9f3e9a765c35",
75+
asset: "ffmpeg-n8.1.2-32-gcfa62de001-win64-lgpl-8.1.zip",
76+
sha256: "c5a091e6a0e446f737f5ae78f9ed38dc02081c014156097468c196b606c4717f",
7777
exe: "ffmpeg.exe",
7878
},
7979
"win32-arm64": {
80-
asset: "ffmpeg-n8.1.2-22-g94138f6973-winarm64-lgpl-8.1.zip",
81-
sha256: "8f89ba5cca2c14ef8e181cdb1bd8403d7b7ee7586151027918a2ac8e42cf7c48",
80+
asset: "ffmpeg-n8.1.2-32-gcfa62de001-winarm64-lgpl-8.1.zip",
81+
sha256: "c5b600e5577142fe7d9d4c9788b91d09a4eaf36900abc5b7cf82b8af54663d7a",
8282
exe: "ffmpeg.exe",
8383
},
8484
"linux-x64": {
85-
asset: "ffmpeg-n8.1.2-22-g94138f6973-linux64-lgpl-8.1.tar.xz",
86-
sha256: "81c8a9fd1f4bb0a888e820d8ddc825cee5116da16efe93054c761ecbc4b54fc3",
85+
asset: "ffmpeg-n8.1.2-32-gcfa62de001-linux64-lgpl-8.1.tar.xz",
86+
sha256: "c54903d95c31d283441bc30ad61ed5d58ed968e18d6169b606dbf175d3719c30",
8787
exe: "ffmpeg",
8888
},
8989
"linux-arm64": {
90-
asset: "ffmpeg-n8.1.2-22-g94138f6973-linuxarm64-lgpl-8.1.tar.xz",
91-
sha256: "0d4777bde13dcfb61de3541d129df8a37f0e24eb0afddb0bab698fa73ec0aed4",
90+
asset: "ffmpeg-n8.1.2-32-gcfa62de001-linuxarm64-lgpl-8.1.tar.xz",
91+
sha256: "f7a5ffe5e8f10957ce4675e0fab8d8a739a33abcf626721a9cfc7fcae40afb3d",
9292
exe: "ffmpeg",
9393
},
9494
};
9595

9696
/**
9797
* The "-shared" sibling of PINNED, from the *same* release tag and source
98-
* commit (n8.1.2-22-g94138f6973) — same ffmpeg, just built with DLLs instead
98+
* commit (n8.1.2-32-gcfa62de001) — same ffmpeg, just built with DLLs instead
9999
* of static linking. Only the compositor addon needs this, and it's
100100
* Windows-only (D3D11), so there's no linux/darwin entry here.
101101
*/
102102
const SHARED_PINNED = {
103103
"win32-x64": {
104-
asset: "ffmpeg-n8.1.2-22-g94138f6973-win64-lgpl-shared-8.1.zip",
105-
sha256: "8bf72607f421282b64f02c6af8683c480e2d299c6b21349ab0f9b5e27c74e223",
104+
asset: "ffmpeg-n8.1.2-32-gcfa62de001-win64-lgpl-shared-8.1.zip",
105+
sha256: "23429f940316ea92e376f6946c0a1f1b9043c930f3bc068228461d65ae24f8b8",
106106
},
107107
"win32-arm64": {
108-
asset: "ffmpeg-n8.1.2-22-g94138f6973-winarm64-lgpl-shared-8.1.zip",
109-
sha256: "8ee2c32da356883297bac055ccf14e0b6eb1fbb2e5f92f24c569a171207da852",
108+
asset: "ffmpeg-n8.1.2-32-gcfa62de001-winarm64-lgpl-shared-8.1.zip",
109+
sha256: "7e8ede09fb48087478a272c57dab1a11eaba6688ee7a3d82728fd365425a1b6e",
110110
},
111111
};
112112

technical-documentation/architecture/native-compositor.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ LIBCLANG_PATH = "C:\\Program Files\\LLVM\\bin"
232232
```
233233

234234
So the thirdparty ffmpeg is **`crates/thirdparty/ffmpeg-n8.1.2-win64-lgpl-shared`**
235-
(the BtbN LGPL-shared build of ffmpeg-n8.1.2-22-g94138f6973, tag
236-
`autobuild-2026-07-15-14-01`). It must be the **same build** that
235+
(the BtbN LGPL-shared build of ffmpeg-n8.1.2-32-gcfa62de001, tag
236+
`autobuild-2026-07-30-13-32`). It must be the **same build** that
237237
`scripts/fetch-ffmpeg.mjs` vendorises into
238238
`electron/native/bin/<tag>/` for packaging. The addon's `require()` loads
239239
`avcodec-NN.dll` / `avformat-NN.dll` / etc. against the vendorised tree at

0 commit comments

Comments
 (0)