diff --git a/Cargo.lock b/Cargo.lock index 0c08f7b5..79123b67 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -311,22 +311,22 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.64.0" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cexpr", "clang-sys", + "itertools", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] @@ -337,9 +337,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bitstream-io" @@ -581,25 +581,24 @@ dependencies = [ [[package]] name = "ffmpeg-sys-the-third" -version = "1.1.1+ffmpeg-6.0" +version = "2.0.0+ffmpeg-7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a4b2e9c02074c0ee85661b23b3ac849bad6afc554b503c183975f5e2e0d3de" +checksum = "a82bfdb0a7925996707f0a7dc37b2f3251ff5a15d26e78c586adb60c240dedc5" dependencies = [ "bindgen", "cc", "libc", - "num_cpus", "pkg-config", "vcpkg", ] [[package]] name = "ffmpeg-the-third" -version = "1.2.2+ffmpeg-6.0" +version = "2.0.1+ffmpeg-7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301c55f432cce71d0cc5266e8e70e69cc7a865f8aa8785c44cb56c3935a13715" +checksum = "c4aa99eb55979d5c1db3b0b7a807a5e50dda07f5f6c2dbc6e9b50c205f611646" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "ffmpeg-sys-the-third", "libc", "serde", @@ -652,7 +651,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", "libgit2-sys", "log", @@ -1142,12 +1141,6 @@ dependencies = [ "stfu8", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "percent-encoding" version = "2.3.1" @@ -1420,7 +1413,7 @@ version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", diff --git a/av1an-core/Cargo.toml b/av1an-core/Cargo.toml index 78e57c01..6a1480f2 100644 --- a/av1an-core/Cargo.toml +++ b/av1an-core/Cargo.toml @@ -63,7 +63,7 @@ features = ["const_generics", "const_new", "union"] [dependencies.ffmpeg] package = "ffmpeg-the-third" -version = "1.2.0" +version = "2.0.1" features = ["serialize"] [dependencies.plotters] diff --git a/av1an-core/src/ffmpeg.rs b/av1an-core/src/ffmpeg.rs index dc02fa57..29250039 100644 --- a/av1an-core/src/ffmpeg.rs +++ b/av1an-core/src/ffmpeg.rs @@ -51,6 +51,7 @@ pub fn num_frames(source: &Path) -> Result { Ok( ictx .packets() + .filter_map(Result::ok) .filter(|(stream, _)| stream.index() == video_stream_index) .count(), ) @@ -122,6 +123,7 @@ pub fn get_keyframes(source: &Path) -> Result, ffmpeg::Error> { let kfs = ictx .packets() + .filter_map(Result::ok) .filter(|(stream, _)| stream.index() == video_stream_index) .map(|(_, packet)| packet) .enumerate() diff --git a/av1an/Cargo.toml b/av1an/Cargo.toml index b4120fdf..dddd805f 100644 --- a/av1an/Cargo.toml +++ b/av1an/Cargo.toml @@ -39,7 +39,7 @@ features = ["git", "git2", "build", "rustc", "cargo"] [dependencies.ffmpeg] package = "ffmpeg-the-third" -version = "1.2.0" +version = "2.0.1" features = ["serialize"] [features]