Rust2018: use new addressing scheme

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

diff --git a/src/codecs/mod.rs b/src/codecs/mod.rs
index 057542a06392609c2619321691e6b9b1d48825d7..b6df370d6af652562ffc86708b25778fbfbfc0c0 100644 (file)
--- a/src/codecs/mod.rs
+++ b/src/codecs/mod.rs
@@ -1,13 +1,13 @@
 use std::fmt;
 use std::ops::{Add, AddAssign, Sub, SubAssign};
 
-use frame::*;
+use crate::frame::*;
 use std::rc::Rc;
 use std::cell::RefCell;
 use std::mem;
-use io::byteio::ByteIOError;
-use io::bitreader::BitReaderError;
-use io::codebook::CodebookError;
+use crate::io::byteio::ByteIOError;
+use crate::io::bitreader::BitReaderError;
+use crate::io::codebook::CodebookError;
 
 #[derive(Debug,Clone,Copy,PartialEq)]
 #[allow(dead_code)]
@@ -156,7 +156,7 @@ impl IPBShuffler {
     }
 }
 
-#[derive(Debug,Clone,Copy)]
+#[derive(Debug,Clone,Copy,PartialEq)]
 pub struct MV {
     pub x: i16,
     pub y: i16,
@@ -249,6 +249,8 @@ mod h263;
 #[cfg(any(feature="decoder_realvideo3", feature="decoder_realvideo4", feature="decoder_realvideo6", feature="decoder_realaudio144", feature="decoder_realaudio288", feature="decoder_cook", feature="decoder_ralf"))]
 mod real;
 
+#[cfg(feature="decoder_aac")]
+mod aac;
 #[cfg(feature="decoder_atrac3")]
 mod atrac3;
 #[cfg(feature="decoder_pcm")]
@@ -304,6 +306,8 @@ const DECODERS: &[DecoderInfo] = &[
     DecoderInfo { name: "cook", get_decoder: real::cook::get_decoder },
 #[cfg(feature="decoder_atrac3")]
     DecoderInfo { name: "atrac3", get_decoder: atrac3::get_decoder },
+#[cfg(feature="decoder_aac")]
+    DecoderInfo { name: "aac", get_decoder: aac::get_decoder },
 #[cfg(feature="decoder_ralf")]
     DecoderInfo { name: "ralf", get_decoder: real::ralf::get_decoder },
 ];