Skip to content

Commit

Permalink
Merge pull request #93 from Polochon-street/bump-ffmpeg
Browse files Browse the repository at this point in the history
Bump ffmpeg version
  • Loading branch information
Polochon-street authored Jan 11, 2025
2 parents ca67034 + 6ffc9ca commit 9c33eaa
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
18 changes: 8 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ integration-tests = []
# Until https://github.com/aubio/aubio/issues/336 is somehow solved
# Hopefully we'll be able to use the official aubio-rs at some point.
bliss-audio-aubio-rs = "0.2.2"
ffmpeg-next = { version = "7.0.3", optional = true }
ffmpeg-next = { version = "7.1.0", optional = true }
ffmpeg-sys-next = { version = "7.0.2", optional = true, default-features = false }
log = "0.4.17"
# `rayon` is used only by `par_mapv_inplace` in chroma.rs.
Expand Down
6 changes: 3 additions & 3 deletions src/playlist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ where
}
}

impl<'a, F: Fn(&Array1<f32>, &Array1<f32>) -> f32 + 'static> DistanceMetric
for FunctionDistanceMetric<'a, F>
impl<F: Fn(&Array1<f32>, &Array1<f32>) -> f32 + 'static> DistanceMetric
for FunctionDistanceMetric<'_, F>
{
fn distance(&self, vector: &Array1<f32>) -> f32 {
self.state.iter().map(|v| (self.func)(v, vector)).sum()
Expand Down Expand Up @@ -194,7 +194,7 @@ struct SongToSongIterator<'a, T: AsRef<Song> + Clone> {
metric_builder: &'a dyn DistanceMetricBuilder,
}

impl<'a, T: AsRef<Song> + Clone> Iterator for SongToSongIterator<'a, T> {
impl<T: AsRef<Song> + Clone> Iterator for SongToSongIterator<'_, T> {
type Item = T;

fn next(&mut self) -> Option<T> {
Expand Down

0 comments on commit 9c33eaa

Please sign in to comment.