Skip to content

Commit 1399b2a

Browse files
committed
fix: revert to ffmpeg6 for windows
1 parent b94301d commit 1399b2a

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/build_windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ env:
44
RUSTFLAGS: -Ctarget-feature=+crt-static
55
VCPKG_DEFAULT_TRIPLET: x64-windows-static
66
VCPKG_DEFAULT_BINARY_CACHE: C:\vcpkg\.cache
7-
VCPKG_COMMIT: 120deac3062162151622ca4860575a33844ba10b
7+
VCPKG_COMMIT: fba75d09065fcc76a25dcf386b1d00d33f5175af
88

99
on:
1010
workflow_dispatch:

src/rust/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ encoding_rs = "0.8.5"
3030
[target.'cfg(target_os = "linux")'.dependencies]
3131
rsmpeg = { version = "0.14.2", default-features = false, features = ["ffmpeg6", "link_system_ffmpeg"], optional = true }
3232

33-
[target.'cfg(target_os = "windows")'.dependencies]
34-
rsmpeg = { version = "0.17.0", default-features = false, features = ["ffmpeg7", "link_system_ffmpeg"], optional = true }
33+
[target.'cfg("windows")'.dependencies]
34+
rsmpeg = { version = "0.14.2", default-features = false, features = ["ffmpeg6", "link_system_ffmpeg"], optional = true }
3535

3636
# Fallback for other platforms (FreeBSD, etc.)
37-
[target.'cfg(not(any(target_os = "linux", target_os = "windows")))'.dependencies]
37+
[target.'cfg(not(any(target_os = "linux", "windows")))'.dependencies]
3838
rsmpeg = { version = "0.18.0", default-features = false, features = ["ffmpeg8", "link_system_ffmpeg"], optional = true }
3939

4040
[build-dependencies]

windows/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"tesseract",
77
"ffmpeg"
88
],
9-
"builtin-baseline": "120deac3062162151622ca4860575a33844ba10b"
9+
"builtin-baseline": "fba75d09065fcc76a25dcf386b1d00d33f5175af"
1010
}

0 commit comments

Comments
 (0)