Rust2018: use new addressing scheme

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

diff --git a/src/demuxers/avi.rs b/src/demuxers/avi.rs
index a0eb7fc50d03f42b2bc1ebfd478a8e066801eed6..a326561af4c57cdebf2e031ca98a8f501346bd8f 100644 (file)
--- a/src/demuxers/avi.rs
+++ b/src/demuxers/avi.rs
@@ -1,9 +1,9 @@
 use super::*;
-use register;
+use crate::register;
 use super::DemuxerError::*;
-use io::byteio::*;
-use frame::*;
-use formats::*;
+//use io::byteio::*;
+//use frame::*;
+use crate::formats::*;
 
 macro_rules! mktag {
     ($a:expr, $b:expr, $c:expr, $d:expr) => ({
@@ -105,7 +105,7 @@ impl<'a> DemuxCore<'a> for AVIDemuxer<'a> {
             let (tb_num, tb_den) = stream.get_timebase();
             let ts = NATimeInfo::new(Some(self.cur_frame[stream_no as usize]), None, None, tb_num, tb_den);
             let pkt = self.src.read_packet(stream, ts, false, size)?;
-            self.cur_frame[stream_no as usize] += 1;            
+            self.cur_frame[stream_no as usize] += 1;
             self.movi_size -= size + 8;
 
             return Ok(pkt);