nihav_mpeg: switch to ByteIO

diff --git a/nihav-mpeg/src/codecs/aac/mod.rs b/nihav-mpeg/src/codecs/aac/mod.rs
index d0588e378ea20c7a946906d5708f0db0c5aae6cb..5adbc07779827ade37713575e87c6a58ff426298 100644 (file)
--- a/nihav-mpeg/src/codecs/aac/mod.rs
+++ b/nihav-mpeg/src/codecs/aac/mod.rs
@@ -681,8 +681,7 @@ impl NADecoder for AACDecoder {
             validate!(edata.len() >= 2);
 
             if (edata.len() > 12) && (&edata[4..8] == b"esds") {
-                let mut mr = MemoryReader::new_read(edata.as_slice());
-                let mut br = ByteReader::new(&mut mr);
+                let mut br = MemoryReader::new_read(edata.as_slice());
                 let esds_size           = br.read_u32be()? as usize;
                 validate!(esds_size <= edata.len());
                                           br.read_skip(8)?;

diff --git a/nihav-mpeg/src/codecs/mpeg4asp/bitstream.rs b/nihav-mpeg/src/codecs/mpeg4asp/bitstream.rs
index ac3f79ba2db4581247b1943f527db70aec5e927c..8d919735fc1fe320959653b814aa0a4c40049326 100644 (file)
--- a/nihav-mpeg/src/codecs/mpeg4asp/bitstream.rs
+++ b/nihav-mpeg/src/codecs/mpeg4asp/bitstream.rs
@@ -33,8 +33,7 @@ impl<'a> ReadMarkerBit for BitReader<'a> {
 }
 
 pub fn scan_start_codes(src: &[u8]) -> DecoderResult<Vec<usize>> {
-    let mut mr = MemoryReader::new_read(src);
-    let mut br = ByteReader::new(&mut mr);
+    let mut br = MemoryReader::new_read(src);
 
     let mut offs = Vec::new();
     let mut pfx = br.read_u32be()?;