Rust2018: use new addressing scheme

[nihav.git] / src / demuxers / mod.rs

diff --git a/src/demuxers/mod.rs b/src/demuxers/mod.rs
index 3ecc983f7a75482a2bf16393a918bc2ee9f0a58a..adf954af270d215ed0bf5aa88f769308095b61af 100644 (file)
--- a/src/demuxers/mod.rs
+++ b/src/demuxers/mod.rs
@@ -1,6 +1,6 @@
 use std::rc::Rc;
-use frame::*;
-use io::byteio::*;
+use crate::frame::*;
+use crate::io::byteio::*;
 
 #[derive(Debug,Clone,Copy,PartialEq)]
 #[allow(dead_code)]
@@ -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<Demuxer<'a>> {
     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))
 }