X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fdemuxers%2Favi.rs;h=4be5217d2cffbf59839947d73aecefec84d595b5;hb=56af6a928847ed91e11eb20141b43c8b5d3bd864;hp=2d2a261f591bd2c968b3a9ad774a872d7ddae7d3;hpb=f149a5b7c236d8ab88daca8417a0cc95dda4edfc;p=nihav.git

diff --git a/src/demuxers/avi.rs b/src/demuxers/avi.rs
index 2d2a261..4be5217 100644
--- a/src/demuxers/avi.rs
+++ b/src/demuxers/avi.rs
@@ -81,6 +81,7 @@ impl<'a> Demux<'a> for AVIDemuxer<'a> {
             if (self.src.tell() & 1) == 1 {
                 self.src.read_skip(1)?;
                 self.movi_size -= 1;
+                if self.movi_size == 0 { return Err(EOF); }
             }
             self.src.read_buf(&mut tag)?;
             let size = self.src.read_u32le()? as usize;
@@ -89,6 +90,12 @@ impl<'a> Demux<'a> for AVIDemuxer<'a> {
                 self.src.read_skip(size)?;
                 continue;
             }
+            if mktag!(tag) == mktag!(b"LIST") {
+                self.movi_size -= 12;
+                self.src.read_skip(4)?;
+                if self.movi_size == 0 { return Err(EOF); }
+                continue;
+            }
             if tag[0] < b'0' || tag[0] > b'9' || tag[1] < b'0' || tag[1] > b'9' {
                 return Err(InvalidData);
             }
@@ -328,7 +335,7 @@ fn parse_strf_auds(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult<usize> {
     let samplespersec       = dmx.src.read_u32le()?;
     let avgbytespersec      = dmx.src.read_u32le()?;
     let block_align         = dmx.src.read_u16le()?;
-    let bits_per_sample     = dmx.src.read_u16le()?;
+    let bits_per_sample     = dmx.src.read_u16le()? * 8;
 
     let soniton = NASoniton::new(bits_per_sample as u8, SONITON_FLAG_SIGNED);
     let ahdr = NAAudioInfo::new(samplespersec, channels as u8, soniton, block_align as usize);