fix clippy warnings for update to rustc 1.46

[nihav.git] / nihav-ms / src / codecs / mod.rs

diff --git a/nihav-ms/src/codecs/mod.rs b/nihav-ms/src/codecs/mod.rs
index 0e1a2375f069d0e01c969534f2629dbc18854d77..752f5e81e1577b5c9b217d15158d39e2f861504f 100644 (file)
--- a/nihav-ms/src/codecs/mod.rs
+++ b/nihav-ms/src/codecs/mod.rs
@@ -4,16 +4,21 @@ macro_rules! validate {
     ($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DecoderError::InvalidData); } };
 }
 
+#[cfg(feature="decoder_msrle")]
+pub mod msrle;
+
 #[cfg(feature="decoder_msvideo1")]
 pub mod msvideo1;
 
 #[cfg(feature="decoder_ima_adpcm_ms")]
 pub mod imaadpcm;
 
-#[cfg(feature="decoder_ms_adpcm")]
+#[cfg(any(feature="decoder_ms_adpcm", feature="encoder_ms_adpcm"))]
 pub mod msadpcm;
 
 const MS_CODECS: &[DecoderInfo] = &[
+#[cfg(feature="decoder_msrle")]
+    DecoderInfo { name: "msrle", get_decoder: msrle::get_decoder },
 #[cfg(feature="decoder_msvideo1")]
     DecoderInfo { name: "msvideo1", get_decoder: msvideo1::get_decoder },
 #[cfg(feature="decoder_ima_adpcm_ms")]
@@ -23,8 +28,25 @@ const MS_CODECS: &[DecoderInfo] = &[
 ];
 
 /// Registers all available codecs provided by this crate.
-pub fn ms_register_all_codecs(rd: &mut RegisteredDecoders) {
+pub fn ms_register_all_decoders(rd: &mut RegisteredDecoders) {
     for decoder in MS_CODECS.iter() {
-        rd.add_decoder(decoder.clone());
+        rd.add_decoder(*decoder);
+    }
+}
+
+#[cfg(feature="encoder_msvideo1")]
+pub mod msvideo1enc;
+
+const MS_ENCODERS: &[EncoderInfo] = &[
+#[cfg(feature="encoder_msvideo1")]
+    EncoderInfo { name: "msvideo1", get_encoder: msvideo1enc::get_encoder },
+#[cfg(feature="encoder_ms_adpcm")]
+    EncoderInfo { name: "ms-adpcm", get_encoder: msadpcm::get_encoder },
+];
+
+/// Registers all available encoders provided by this crate.
+pub fn ms_register_all_encoders(re: &mut RegisteredEncoders) {
+    for encoder in MS_ENCODERS.iter() {
+        re.add_encoder(*encoder);
     }
 }