Rust2018: use new addressing scheme

6 files changed, 22 insertions, 22 deletions

diff --git a/src/codecs/indeo/imc.rs b/src/codecs/indeo/imc.rs
index 9a2ba21..f11daa9 100644
--- a/src/codecs/indeo/imc.rs
+++ b/src/codecs/indeo/imc.rs
@@ -2,13 +2,13 @@ use std::mem;
 use std::ptr;
 use std::f32::consts;
 
-use formats::*;
-use frame::*;
+use crate::formats::*;
+use crate::frame::*;
 use super::super::*;
-use io::bitreader::*;
-use io::codebook::*;
-use dsp::fft::*;
-use dsp::window::*;
+use crate::io::bitreader::*;
+use crate::io::codebook::*;
+use crate::dsp::fft::*;
+use crate::dsp::window::*;
 
 const BANDS:      usize =  32;
 const COEFFS:     usize = 256;
@@ -1107,7 +1107,7 @@ const IMC_CB_SELECTOR: [[usize; BANDS]; 4] = [
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::*;
+    use crate::test::dec_video::*;
     #[test]
     fn test_imc() {
 //        let file = "assets/neal73_saber.avi";
diff --git a/src/codecs/indeo/indeo2.rs b/src/codecs/indeo/indeo2.rs
index 4f7abdd..61f1c77 100644
--- a/src/codecs/indeo/indeo2.rs
+++ b/src/codecs/indeo/indeo2.rs
@@ -1,6 +1,6 @@
-use io::bitreader::*;
-use io::codebook::*;
-use formats;
+use crate::io::bitreader::*;
+use crate::io::codebook::*;
+use crate::formats;
 use super::super::*;
 
 static INDEO2_DELTA_TABLE: [[u8; 256]; 4] = [
@@ -367,7 +367,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::test_file_decoding;
+    use crate::test::dec_video::test_file_decoding;
     #[test]
     fn test_indeo2() {
          test_file_decoding("avi", "assets/laser05.avi", Some(10), true, false, None);
diff --git a/src/codecs/indeo/indeo3.rs b/src/codecs/indeo/indeo3.rs
index 9a3d617..5b4876d 100644
--- a/src/codecs/indeo/indeo3.rs
+++ b/src/codecs/indeo/indeo3.rs
@@ -1,6 +1,6 @@
-use formats;
+use crate::formats;
 use super::super::*;
-use io::byteio::*;
+use crate::io::byteio::*;
 use std::io::SeekFrom;
 use std::mem;
 
@@ -783,7 +783,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::test_file_decoding;
+    use crate::test::dec_video::test_file_decoding;
     #[test]
     fn test_indeo3() {
          test_file_decoding("avi", "assets/iv32_example.avi", Some(10), true, false, None);
diff --git a/src/codecs/indeo/indeo4.rs b/src/codecs/indeo/indeo4.rs
index 36ec86b..773b177 100644
--- a/src/codecs/indeo/indeo4.rs
+++ b/src/codecs/indeo/indeo4.rs
@@ -1,6 +1,6 @@
 use std::cell::Ref;
-use io::bitreader::*;
-use formats;
+use crate::io::bitreader::*;
+use crate::formats;
 use super::super::*;
 use super::ivi::*;
 use super::ivibr::*;
@@ -764,7 +764,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::test_file_decoding;
+    use crate::test::dec_video::test_file_decoding;
     #[test]
     fn test_indeo4() {
          test_file_decoding("avi", "assets/IV4/volcano.avi", /*None*/Some(16), true, false, None/*Some("iv4")*/);
diff --git a/src/codecs/indeo/indeo5.rs b/src/codecs/indeo/indeo5.rs
index bf3b974..c761a8e 100644
--- a/src/codecs/indeo/indeo5.rs
+++ b/src/codecs/indeo/indeo5.rs
@@ -1,6 +1,6 @@
 use std::cell::Ref;
-use io::bitreader::*;
-use formats;
+use crate::io::bitreader::*;
+use crate::formats;
 use super::super::*;
 use super::ivi::*;
 use super::ivibr::*;
@@ -717,7 +717,7 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use test::dec_video::test_file_decoding;
+    use crate::test::dec_video::test_file_decoding;
     #[test]
     fn test_indeo5() {
          test_file_decoding("avi", "assets/IV5/sample.avi", /*None*/Some(2), true, false, None);
diff --git a/src/codecs/indeo/ivibr.rs b/src/codecs/indeo/ivibr.rs
index 2e1dd9a..3011e1a 100644
--- a/src/codecs/indeo/ivibr.rs
+++ b/src/codecs/indeo/ivibr.rs
@@ -1,10 +1,10 @@
 use std::mem;
 use std::rc::Rc;
 use std::cell::{Ref,RefCell};
-use io::bitreader::*;
+use crate::io::bitreader::*;
 //use io::intcode::*;
 use super::super::*;
-use formats::*;
+use crate::formats::*;
 use super::ivi::*;
 use super::ividsp::*;