X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fdemuxers%2Fmod.rs;h=347b7e3a50b321c39982e4c410e36a6c86106194;hb=47add47cb6a02a68e6e94755ba24ff348ca2065b;hp=46603b23433361c7e5aa0a839f9fa72ad0222c12;hpb=fe07b469b3daf8eb4a1be6c3781f9d8c643e70af;p=nihav.git diff --git a/src/demuxers/mod.rs b/src/demuxers/mod.rs index 46603b2..347b7e3 100644 --- a/src/demuxers/mod.rs +++ b/src/demuxers/mod.rs @@ -201,7 +201,7 @@ pub trait DemuxerCreator { } macro_rules! validate { - ($a:expr) => { if !$a { return Err(DemuxerError::InvalidData); } }; + ($a:expr) => { if !$a { println!("check failed at {}:{}", file!(), line!()); return Err(DemuxerError::InvalidData); } }; } #[cfg(feature="demuxer_gdv")] @@ -219,10 +219,10 @@ const DEMUXERS: &[&'static DemuxerCreator] = &[ &gdv::GDVDemuxerCreator {}, #[cfg(feature="demuxer_real")] &realmedia::RealMediaDemuxerCreator {}, -//#[cfg(feature="demuxer_real")] -// &realmedia::RealAudioDemuxerCreator {}, -//#[cfg(feature="demuxer_real")] -// &realmedia::RealIVRDemuxerCreator {}, +#[cfg(feature="demuxer_real")] + &realmedia::RealAudioDemuxerCreator {}, +#[cfg(feature="demuxer_real")] + &realmedia::RealIVRDemuxerCreator {}, ]; pub fn find_demuxer(name: &str) -> Option<&DemuxerCreator> { @@ -237,6 +237,6 @@ pub fn find_demuxer(name: &str) -> Option<&DemuxerCreator> { 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(); - dmx.open(&mut str)?; + dmx.open(&mut str)?; Ok(Demuxer::new(dmx, str)) }