Skip to content

Commit 4c14b91

Browse files
committed
Use rsmpeg 0.18.0 with platform-specific FFmpeg features
- Single rsmpeg version (0.18.0) for all platforms - Platform-specific FFmpeg features: Linux=ffmpeg6, Windows=ffmpeg7, macOS=ffmpeg8 - Prevents multiple feature compilation - only one FFmpeg version per platform - Cleaner and more maintainable configuration
1 parent 1b982c8 commit 4c14b91

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/rust/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ lib_ccxr = { path = "lib_ccxr" }
2626
url = "2.5.4"
2727
encoding_rs = "0.8.5"
2828

29-
# Platform-specific rsmpeg versions
29+
# Use rsmpeg 0.18.0 with platform-specific FFmpeg features
3030
[target.'cfg(target_os = "linux")'.dependencies]
31-
rsmpeg = { version = "=0.14.2", default-features = false, features = ["link_system_ffmpeg"], optional = true }
31+
rsmpeg = { version = "0.18.0", default-features = false, features = ["ffmpeg6", "link_system_ffmpeg"], optional = true }
3232

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

3636
[target.'cfg(target_os = "macos")'.dependencies]
37-
rsmpeg = { version = "=0.18.0", default-features = false, features = ["link_system_ffmpeg"], optional = true }
37+
rsmpeg = { version = "0.18.0", default-features = false, features = ["ffmpeg8", "link_system_ffmpeg"], optional = true }
3838

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

4343
[build-dependencies]
4444
bindgen = "0.64.0"

src/rust/src/rsmpeg_compat.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Re-export rsmpeg - the version is determined by platform-specific dependencies in Cargo.toml
2-
// Linux: rsmpeg 0.14.2 (FFmpeg 6)
3-
// Windows: rsmpeg 0.17.0 (FFmpeg 7)
4-
// macOS/others: rsmpeg 0.18.0 (FFmpeg 8)
1+
// Re-export rsmpeg - using version 0.18.0 with platform-specific FFmpeg features
2+
// Linux: ffmpeg6 feature
3+
// Windows: ffmpeg7 feature
4+
// macOS/others: ffmpeg8 feature
55

66
pub use rsmpeg;

0 commit comments

Comments
 (0)