X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-core%2Fsrc%2Fdemuxers%2Fmod.rs;h=86de78de260044d8f03acaae512c523e13d85041;hb=11a46b93be48216b494cbafc4c0455e3317df733;hp=56e670db986575f50bf2e0e52f85955e2833844b;hpb=5641dccfbf2a70d589cf094a0d4ed5a10f919f00;p=nihav.git diff --git a/nihav-core/src/demuxers/mod.rs b/nihav-core/src/demuxers/mod.rs index 56e670d..86de78d 100644 --- a/nihav-core/src/demuxers/mod.rs +++ b/nihav-core/src/demuxers/mod.rs @@ -200,19 +200,6 @@ pub trait DemuxerCreator { fn get_name(&self) -> &'static str; } -macro_rules! validate { - ($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DemuxerError::InvalidData); } }; -} - -#[cfg(feature="demuxer_avi")] -mod avi; - - -const DEMUXERS: &[&'static DemuxerCreator] = &[ -#[cfg(feature="demuxer_avi")] - &avi::AVIDemuxerCreator {}, -]; - pub fn create_demuxer<'a>(dmxcr: &DemuxerCreator, br: &'a mut ByteReader<'a>) -> DemuxerResult> { let mut dmx = dmxcr.new_demuxer(br); let mut str = StreamManager::new(); @@ -239,10 +226,4 @@ impl RegisteredDemuxers { } None } -} - -pub fn core_register_all_demuxers(rd: &mut RegisteredDemuxers) { - for demuxer in DEMUXERS.into_iter() { - rd.add_demuxer(*demuxer); - } -} +} \ No newline at end of file