Merge af3b69e6a4 into 35560e94f5

src/reader.rs

@@ -145,6 +145,7 @@ impl<R: Read + Seek> Mp4Reader<R> {
 
         let mut moofs = Vec::new();
         let mut moof_offsets = Vec::new();
+        let mut uuids = Vec::new();
 
         let mut current = start;
         while current < size {
@@ -173,6 +174,10 @@ impl<R: Read + Seek> Mp4Reader<R> {
                     moofs.push(moof);
                     moof_offsets.push(moof_offset);
                 }
+                BoxType::UuidBox => {
+                    let uuid = UuidBox::read_box(&mut reader, s)?;
+                    uuids.push(uuid);
+                }
                 _ => {
                     // XXX warn!()
                     skip_box(&mut reader, s)?;
@@ -216,8 +221,8 @@ impl<R: Read + Seek> Mp4Reader<R> {
             ftyp: self.ftyp.clone(),
             moov: self.moov.clone(),
             moofs,
-            emsgs: self.emsgs.clone(),
-            uuids: self.uuids.clone(),
+            emsgs: Vec::new(),
+            uuids,
             tracks,
             size,
         })

src/track.rs

@@ -261,7 +261,7 @@ impl Mp4Track {
 
     pub fn sequence_parameter_set(&self) -> Result<&[u8]> {
         if let Some(ref avc1) = self.trak.mdia.minf.stbl.stsd.avc1 {
-            match avc1.avcc.sequence_parameter_sets.get(0) {
+            match avc1.avcc.sequence_parameter_sets.first() {
                 Some(nal) => Ok(nal.bytes.as_ref()),
                 None => Err(Error::EntryInStblNotFound(
                     self.track_id(),
@@ -276,7 +276,7 @@ impl Mp4Track {
 
     pub fn picture_parameter_set(&self) -> Result<&[u8]> {
         if let Some(ref avc1) = self.trak.mdia.minf.stbl.stsd.avc1 {
-            match avc1.avcc.picture_parameter_sets.get(0) {
+            match avc1.avcc.picture_parameter_sets.first() {
                 Some(nal) => Ok(nal.bytes.as_ref()),
                 None => Err(Error::EntryInStblNotFound(
                     self.track_id(),