From efbc53fa7133d806c01c2cd8d7bc5487b13ae6b2 Mon Sep 17 00:00:00 2001 From: Tommy Builds Date: Tue, 23 Apr 2024 08:03:02 -0700 Subject: [PATCH] Tweak cargo file dependencies --- Cargo.lock | 28 ++++++++++++++-------------- engine_ffmpeg/Cargo.toml | 2 +- engine_ffmpeg/src/audio_player.rs | 2 +- engine_ffmpeg/src/lib.rs | 4 ++-- engine_ffmpeg/src/video_player.rs | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fb3d96a..0d726fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -921,7 +921,7 @@ dependencies = [ "byteorder", "cgmath", "engine", - "ffmpeg-next", + "ffmpeg-the-third", ] [[package]] @@ -1016,28 +1016,28 @@ dependencies = [ ] [[package]] -name = "ffmpeg-next" -version = "6.0.0" +name = "ffmpeg-sys-the-third" +version = "1.1.1+ffmpeg-6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8af03c47ad26832ab3aabc4cdbf210af3d3b878783edd5a7ba044ba33aab7a60" +checksum = "94a4b2e9c02074c0ee85661b23b3ac849bad6afc554b503c183975f5e2e0d3de" dependencies = [ - "bitflags 1.3.2", - "ffmpeg-sys-next", + "bindgen", + "cc", "libc", + "num_cpus", + "pkg-config", + "vcpkg", ] [[package]] -name = "ffmpeg-sys-next" -version = "6.0.1" +name = "ffmpeg-the-third" +version = "1.2.2+ffmpeg-6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf650f461ccf130f4eef4927affed703cc387b183bfc4a7dfee86a076c131127" +checksum = "301c55f432cce71d0cc5266e8e70e69cc7a865f8aa8785c44cb56c3935a13715" dependencies = [ - "bindgen", - "cc", + "bitflags 1.3.2", + "ffmpeg-sys-the-third", "libc", - "num_cpus", - "pkg-config", - "vcpkg", ] [[package]] diff --git a/engine_ffmpeg/Cargo.toml b/engine_ffmpeg/Cargo.toml index f3de281..645b081 100644 --- a/engine_ffmpeg/Cargo.toml +++ b/engine_ffmpeg/Cargo.toml @@ -11,4 +11,4 @@ path = "src/lib.rs" engine = { path = "../engine" } cgmath = "0.18.0" byteorder = "1.4.3" -ffmpeg-next = "6.0.0" +ffmpeg-the-third = { version = "1.2.2" , features = ["build"] } diff --git a/engine_ffmpeg/src/audio_player.rs b/engine_ffmpeg/src/audio_player.rs index 232926f..821b0cb 100644 --- a/engine_ffmpeg/src/audio_player.rs +++ b/engine_ffmpeg/src/audio_player.rs @@ -1,4 +1,4 @@ -extern crate ffmpeg_next as ffmpeg; +extern crate ffmpeg_the_third as ffmpeg; use engine::audio::AudioClip; use ffmpeg::media::Type; diff --git a/engine_ffmpeg/src/lib.rs b/engine_ffmpeg/src/lib.rs index 46d3fa7..c9e9140 100644 --- a/engine_ffmpeg/src/lib.rs +++ b/engine_ffmpeg/src/lib.rs @@ -4,6 +4,6 @@ mod video_player; pub use crate::audio_player::AudioPlayer; pub use crate::video_player::VideoPlayer; -pub fn init() -> Result<(), ffmpeg_next::Error> { - ffmpeg_next::init() +pub fn init() -> Result<(), ffmpeg_the_third::Error> { + ffmpeg_the_third::init() } diff --git a/engine_ffmpeg/src/video_player.rs b/engine_ffmpeg/src/video_player.rs index 20a9966..ad69ee8 100644 --- a/engine_ffmpeg/src/video_player.rs +++ b/engine_ffmpeg/src/video_player.rs @@ -1,4 +1,4 @@ -extern crate ffmpeg_next as ffmpeg; +extern crate ffmpeg_the_third as ffmpeg; use engine::texture_format::{PixelFormat, RawTextureData}; use ffmpeg::format::{input, Pixel};