Skip to content

The swiss army knife of lossless video/audio editing

Upgrade bundled FFmpeg to 8.1

Claudeff713b44f83c
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index add5fa88..298f13ee 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -162,9 +162,12 @@ Links:
### Upgrade FFmpeg
-- [ffmpeg-build-script](https://github.com/mifi/ffmpeg-build-script)
-- [ffmpeg-builds](https://github.com/mifi/ffmpeg-builds)
-- [package.json](./package.json) download scripts.
+Keep all platforms on the same FFmpeg release branch (e.g. 8.1).
+
+1. macOS: bump `FFMPEG_VERSION` (and deps) in [ffmpeg-build-script](https://github.com/mifi/ffmpeg-build-script), then tag a release there (see its README).
+2. Windows and Linux: mirror the [BtbN](https://github.com/BtbN/FFmpeg-Builds) `gpl-shared` builds for that branch in a new [ffmpeg-builds](https://github.com/mifi/ffmpeg-builds) release (see its README). BtbN only builds the newest release branches, so check that the branch you want is still built.
+3. Update the `download-ffmpeg-*` scripts in [package.json](./package.json): the release tags, file names and extracted folder names.
+4. Test a nightly build on each platform: cutting (keyframe and normal), merging, smart cut and FFmpeg-assisted playback.
### Upgrade Electron
diff --git a/package.json b/package.json
index 94f2f759..002eae3d 100644
--- a/package.json
+++ b/package.json
@@ -11,11 +11,11 @@
"clean": "rimraf dist out common-ts-dist main-ts-dist build-resources icon-build",
"start": "electron-vite preview",
"dev": "electron-vite dev -w",
- "download-ffmpeg-darwin-x64": "mkdirp ffmpeg/darwin-x64 && cd ffmpeg/darwin-x64 && wget https://github.com/mifi/ffmpeg-build-script/releases/download/8.0-1/ffmpeg-macos-X64 -O ffmpeg && wget https://github.com/mifi/ffmpeg-build-script/releases/download/8.0-1/ffprobe-macos-X64 -O ffprobe && chmod +x ffmpeg && chmod +x ffprobe",
- "download-ffmpeg-darwin-arm64": "mkdirp ffmpeg/darwin-arm64 && cd ffmpeg/darwin-arm64 && wget https://github.com/mifi/ffmpeg-build-script/releases/download/8.0-1/ffmpeg-macos-ARM64 -O ffmpeg && wget https://github.com/mifi/ffmpeg-build-script/releases/download/8.0-1/ffprobe-macos-ARM64 -O ffprobe && chmod +x ffmpeg && chmod +x ffprobe",
- "download-ffmpeg-linux-x64": "mkdirp ffmpeg/linux-x64 && cd ffmpeg/linux-x64 && wget https://github.com/mifi/ffmpeg-builds/releases/download/8.0-1/ffmpeg-n8.0-latest-linux64-gpl-shared-8.0.tar.xz -O ffmpeg-ffprobe.xz && tar -xv -f ffmpeg-ffprobe.xz && mv ffmpeg-n8.0-latest-linux64-gpl-shared-8.0 extracted && mkdirp lib && mv extracted/bin/ffmpeg extracted/bin/ffprobe extracted/lib/lib*.so* lib",
- "download-ffmpeg-win32-x64": "mkdirp ffmpeg/win32-x64 && cd ffmpeg/win32-x64 && npx download-cli https://github.com/mifi/ffmpeg-builds/releases/download/8.0-1/ffmpeg-n8.0-latest-win64-gpl-shared-8.0.zip --out . --filename ffmpeg-ffprobe.zip && 7z x ffmpeg-ffprobe.zip && mkdirp lib && cd ffmpeg-n8.0-latest-win64-gpl-shared-8.0/bin && npx shx mv ffmpeg.exe ffprobe.exe *.dll ../../lib",
- "download-ffmpeg-win32-arm64": "mkdirp ffmpeg/win32-arm64 && cd ffmpeg/win32-arm64 && npx download-cli https://github.com/mifi/ffmpeg-builds/releases/download/8.0-1/ffmpeg-n8.0.1-76-gfa4ee7ab3c-winarm64-gpl-shared-8.0.zip --out . --filename ffmpeg-ffprobe.zip && 7z x ffmpeg-ffprobe.zip && mkdirp lib && cd ffmpeg-n8.0.1-76-gfa4ee7ab3c-winarm64-gpl-shared-8.0/bin && npx shx mv ffmpeg.exe ffprobe.exe *.dll ../../lib",
+ "download-ffmpeg-darwin-x64": "mkdirp ffmpeg/darwin-x64 && cd ffmpeg/darwin-x64 && wget https://github.com/mifi/ffmpeg-build-script/releases/download/8.1.3-1/ffmpeg-macos-X64 -O ffmpeg && wget https://github.com/mifi/ffmpeg-build-script/releases/download/8.1.3-1/ffprobe-macos-X64 -O ffprobe && chmod +x ffmpeg && chmod +x ffprobe",
+ "download-ffmpeg-darwin-arm64": "mkdirp ffmpeg/darwin-arm64 && cd ffmpeg/darwin-arm64 && wget https://github.com/mifi/ffmpeg-build-script/releases/download/8.1.3-1/ffmpeg-macos-ARM64 -O ffmpeg && wget https://github.com/mifi/ffmpeg-build-script/releases/download/8.1.3-1/ffprobe-macos-ARM64 -O ffprobe && chmod +x ffmpeg && chmod +x ffprobe",
+ "download-ffmpeg-linux-x64": "mkdirp ffmpeg/linux-x64 && cd ffmpeg/linux-x64 && wget https://github.com/mifi/ffmpeg-builds/releases/download/8.1-1/ffmpeg-n8.1-latest-linux64-gpl-shared-8.1.tar.xz -O ffmpeg-ffprobe.xz && tar -xv -f ffmpeg-ffprobe.xz && mv ffmpeg-n8.1-latest-linux64-gpl-shared-8.1 extracted && mkdirp lib && mv extracted/bin/ffmpeg extracted/bin/ffprobe extracted/lib/lib*.so* lib",
+ "download-ffmpeg-win32-x64": "mkdirp ffmpeg/win32-x64 && cd ffmpeg/win32-x64 && npx download-cli https://github.com/mifi/ffmpeg-builds/releases/download/8.1-1/ffmpeg-n8.1-latest-win64-gpl-shared-8.1.zip --out . --filename ffmpeg-ffprobe.zip && 7z x ffmpeg-ffprobe.zip && mkdirp lib && cd ffmpeg-n8.1-latest-win64-gpl-shared-8.1/bin && npx shx mv ffmpeg.exe ffprobe.exe *.dll ../../lib",
+ "download-ffmpeg-win32-arm64": "mkdirp ffmpeg/win32-arm64 && cd ffmpeg/win32-arm64 && npx download-cli https://github.com/mifi/ffmpeg-builds/releases/download/8.1-1/ffmpeg-n8.1-latest-winarm64-gpl-shared-8.1.zip --out . --filename ffmpeg-ffprobe.zip && 7z x ffmpeg-ffprobe.zip && mkdirp lib && cd ffmpeg-n8.1-latest-winarm64-gpl-shared-8.1/bin && npx shx mv ffmpeg.exe ffprobe.exe *.dll ../../lib",
"build": "yarn generate-icon && electron-vite build",
"tsc": "tsc --build",
"test": "vitest",