aac: clear M/S flags

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

diff --git a/nihav-mpeg/src/codecs/mod.rs b/nihav-mpeg/src/codecs/mod.rs
index 20dcd650376ccaaffcad4213d32fcb4058f650c9..f6fb31cd6301e48f3331cffb41a59362fae4a1ab 100644 (file)
--- a/nihav-mpeg/src/codecs/mod.rs
+++ b/nihav-mpeg/src/codecs/mod.rs
@@ -1,10 +1,17 @@
 use nihav_core::codecs::*;
 
+#[cfg(debug_assertions)]
 macro_rules! validate {
     ($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DecoderError::InvalidData); } };
 }
+#[cfg(not(debug_assertions))]
+macro_rules! validate {
+    ($a:expr) => { if !$a { return Err(DecoderError::InvalidData); } };
+}
 
 #[cfg(feature="decoder_aac")]
+#[allow(clippy::comparison_chain)]
+#[allow(clippy::excessive_precision)]
 #[allow(clippy::manual_memcpy)]
 #[allow(clippy::useless_let_if_seq)]
 mod aac;
@@ -15,6 +22,8 @@ mod mpegaudio;
 const DECODERS: &[DecoderInfo] = &[
 #[cfg(feature="decoder_aac")]
     DecoderInfo { name: "aac", get_decoder: aac::get_decoder },
+#[cfg(feature="decoder_mpa")]
+    DecoderInfo { name: "mp2", get_decoder: mpegaudio::get_decoder_mp2 },
 #[cfg(feature="decoder_mpa")]
     DecoderInfo { name: "mp3", get_decoder: mpegaudio::get_decoder_mp3 },
 ];
@@ -28,7 +37,7 @@ pub fn mpeg_register_all_decoders(rd: &mut RegisteredDecoders) {
 
 const PACKETISERS: &[PacketiserInfo] = &[
 #[cfg(feature="decoder_mpa")]
-    PacketiserInfo { name: "mp3", get_packetiser: mpegaudio::get_packetiser },
+    PacketiserInfo { name: "mpa", get_packetiser: mpegaudio::get_packetiser },
 ];
 
 /// Registers all available packetisers provided by this crate.