avi: fix the situation when last chunk is padded

[nihav.git] / src / demuxers / avi.rs

diff --git a/src/demuxers/avi.rs b/src/demuxers/avi.rs
index 2d2a261f591bd2c968b3a9ad774a872d7ddae7d3..3810bc82d99e49989d373660c07cf6ff6b64e535 100644 (file)
--- 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;
@@ -328,7 +329,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);