Support ffmpeg 7.0

Closes master-of-zen#832
shssoichiro · May 6, 2024 · c544b35 · c544b35
1 parent e69826f
commit c544b35
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -51,6 +51,7 @@ pub fn num_frames(source: &Path) -> Result<usize, ffmpeg::Error> {
   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<Vec<usize>, 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
@@ -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]