X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fdemuxers%2Fmod.rs;h=3edb2bc50c1ed3e87b6aaa6602e9b7f646fe9c65;hb=0ad1f05e99c19c79acc7f5e8e18a94468af275ac;hp=fa388e3103409cd5b9dab33c51de0277a92a58f1;hpb=38953fb529efad1b0b609eec77f7839e62ad2719;p=nihav.git diff --git a/nihav-commonfmt/src/demuxers/mod.rs b/nihav-commonfmt/src/demuxers/mod.rs index fa388e3..3edb2bc 100644 --- a/nihav-commonfmt/src/demuxers/mod.rs +++ b/nihav-commonfmt/src/demuxers/mod.rs @@ -1,20 +1,36 @@ use nihav_core::demuxers::*; +#[allow(unused_macros)] macro_rules! validate { ($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DemuxerError::InvalidData); } }; } #[cfg(feature="demuxer_avi")] +#[allow(clippy::cast_lossless)] mod avi; +#[cfg(feature="demuxer_mov")] +#[allow(clippy::cast_lossless)] +mod mov; +#[cfg(feature="demuxer_wav")] +mod wav; +#[cfg(feature="demuxer_y4m")] +mod y4m; -const DEMUXERS: &[&'static DemuxerCreator] = &[ +const DEMUXERS: &[&dyn DemuxerCreator] = &[ #[cfg(feature="demuxer_avi")] &avi::AVIDemuxerCreator {}, +#[cfg(feature="demuxer_mov")] + &mov::MOVDemuxerCreator {}, +#[cfg(feature="demuxer_wav")] + &wav::WAVDemuxerCreator {}, +#[cfg(feature="demuxer_y4m")] + &y4m::Y4MDemuxerCreator {}, ]; +/// Registers all available demuxers provided by this crate. pub fn generic_register_all_demuxers(rd: &mut RegisteredDemuxers) { - for demuxer in DEMUXERS.into_iter() { + for demuxer in DEMUXERS.iter() { rd.add_demuxer(*demuxer); } }