X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fdemuxers%2Favi.rs;h=67195c2ddb61c4b7bf4c9d9bea4bc1495cfeda2c;hb=d293626f59d2bc15dcff83af03072688eed7656a;hp=2a3f8f0bb49fc3f84680c7002d4139b5794b1386;hpb=f6fa6f3404393e399a05c5d5cda7a35c4e41fb4a;p=nihav.git

diff --git a/src/demuxers/avi.rs b/src/demuxers/avi.rs
index 2a3f8f0..67195c2 100644
--- a/src/demuxers/avi.rs
+++ b/src/demuxers/avi.rs
@@ -139,7 +139,8 @@ impl<'a> AVIDemuxer<'a> {
         if RIFFTag::Chunk(tag) == end_tag {
             return Ok((size, true));
         }
-        let ltag = if is_list_tag(tag) { self.src.read_u32be()? } else { 0 };
+        let is_list = is_list_tag(tag);
+        let ltag = if is_list { self.src.read_u32be()? } else { 0 };
         if RIFFTag::List(tag, ltag) == end_tag {
             return Ok((size, true));
         }
@@ -170,7 +171,12 @@ impl<'a> AVIDemuxer<'a> {
                 return Ok((size + 8, false));
             }
         }
-        self.src.read_skip(size)?;
+        if !is_list {
+            self.src.read_skip(size)?;
+        } else {
+            if size < 4 { return Err(InvalidData); }
+            self.src.read_skip(size - 4)?;
+        }
         if (size & 1) == 1 { self.src.read_skip(1)?; }
         return Ok((size + 8, false));
     }
@@ -322,7 +328,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);