From df70c709a909a0101d7860fccc58ccf31b40fcc2 Mon Sep 17 00:00:00 2001
From: Dominik Winecki <dominikwinecki@gmail.com>
Date: Thu, 5 Sep 2024 02:49:19 +0000
Subject: [PATCH] Clippy fixes

---
 vidformer/src/av/muxer.rs                 | 5 +----
 vidformer/src/dve.rs                      | 2 +-
 vidformer/src/filter/builtin/drawutils.rs | 6 +++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/vidformer/src/av/muxer.rs b/vidformer/src/av/muxer.rs
index 2ebc770..44034e1 100644
--- a/vidformer/src/av/muxer.rs
+++ b/vidformer/src/av/muxer.rs
@@ -21,10 +21,7 @@ impl Muxer {
         let output_path = CString::new(output_path).unwrap();
         let mut ofmt_ctx: *mut ffi::AVFormatContext = ptr::null_mut();
 
-        let format_name_cstr: Option<CString> = match format_name {
-            Some(name) => Some(CString::new(name).unwrap()),
-            None => None,
-        };
+        let format_name_cstr: Option<CString> = format_name.map(|name| CString::new(name).unwrap());
 
         if unsafe {
             ffi::avformat_alloc_output_context2(
diff --git a/vidformer/src/dve.rs b/vidformer/src/dve.rs
index bebc35e..7502362 100644
--- a/vidformer/src/dve.rs
+++ b/vidformer/src/dve.rs
@@ -1140,7 +1140,7 @@ fn encoder_thread(
         &output_path,
         encoder_codec_params,
         &output_time_base,
-        config.format.as_ref().map(|x| x.as_str()),
+        config.format.as_deref(),
     )?;
     let muxer_time_base = crate::util::avrat_to_rat(&muxer.out_time_base);
     let encoder_to_muxer_ts_multiplier: num_rational::Ratio<i64> =
diff --git a/vidformer/src/filter/builtin/drawutils.rs b/vidformer/src/filter/builtin/drawutils.rs
index f66fb12..6aa1103 100644
--- a/vidformer/src/filter/builtin/drawutils.rs
+++ b/vidformer/src/filter/builtin/drawutils.rs
@@ -319,8 +319,8 @@ pub(crate) unsafe fn ff_copy_rectangle2(
         let src_linesize = std::slice::from_raw_parts_mut(src_linesize, draw.nb_planes as usize);
 
         for plane in 0..draw.nb_planes as usize {
-            let mut p = pointer_at(draw, &src, src_linesize, plane, src_x, src_y);
-            let mut q = pointer_at(draw, &dst, dst_linesize, plane, dst_x, dst_y);
+            let mut p = pointer_at(draw, src, src_linesize, plane, src_x, src_y);
+            let mut q = pointer_at(draw, dst, dst_linesize, plane, dst_x, dst_y);
             let wp =
                 ((w + (1 << draw.hsub[plane]) - 1) >> draw.hsub[plane]) * draw.pixelstep[plane];
             let hp = (h + (1 << draw.vsub[plane]) - 1) >> draw.vsub[plane];
@@ -351,7 +351,7 @@ pub(crate) unsafe fn ff_fill_rectangle(
         let dst_linesize = std::slice::from_raw_parts_mut(dst_linesize, draw.nb_planes as usize);
 
         for plane in 0..draw.nb_planes as usize {
-            let p0 = pointer_at(draw, &dst, dst_linesize, plane, dst_x, dst_y);
+            let p0 = pointer_at(draw, dst, dst_linesize, plane, dst_x, dst_y);
             let wp = ((w + (1 << draw.hsub[plane]) - 1) >> draw.hsub[plane]) as usize;
             let hp = ((h + (1 << draw.vsub[plane]) - 1) >> draw.vsub[plane]) as usize;
             if hp == 0 {