projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
split remaining decoders and demuxer from core
[nihav.git]
/
nihav-core
/
src
/
demuxers
/
mod.rs
diff --git
a/nihav-core/src/demuxers/mod.rs
b/nihav-core/src/demuxers/mod.rs
index 56e670db986575f50bf2e0e52f85955e2833844b..bfd492ae966c763b16df55a37db28d857040b016 100644
(file)
--- a/
nihav-core/src/demuxers/mod.rs
+++ b/
nihav-core/src/demuxers/mod.rs
@@
-204,15
+204,6
@@
macro_rules! validate {
($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DemuxerError::InvalidData); } };
}
($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<Demuxer<'a>> {
let mut dmx = dmxcr.new_demuxer(br);
let mut str = StreamManager::new();
pub fn create_demuxer<'a>(dmxcr: &DemuxerCreator, br: &'a mut ByteReader<'a>) -> DemuxerResult<Demuxer<'a>> {
let mut dmx = dmxcr.new_demuxer(br);
let mut str = StreamManager::new();
@@
-239,10
+230,4
@@
impl RegisteredDemuxers {
}
None
}
}
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