X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fdemuxers%2Fbink.rs;h=29427af1bab54b6df777cca6b2c9e1801cb58641;hb=3584b223ce417fe167dc90cb9a40e173f34823c0;hp=ef0e14893234070038609fcb8b0ac4893dee7efc;hpb=ffdf2c7f37da3f3bf8fad63a9e693ed89454d4e6;p=nihav.git diff --git a/nihav-rad/src/demuxers/bink.rs b/nihav-rad/src/demuxers/bink.rs index ef0e148..29427af 100644 --- a/nihav-rad/src/demuxers/bink.rs +++ b/nihav-rad/src/demuxers/bink.rs @@ -68,8 +68,7 @@ impl<'a> DemuxCore<'a> for BinkDemuxer<'a> { validate!((self.frames > 0) && (tb_num > 0) && (tb_den > 0) && (max_size < fsize)); let mut flags: [u8; 4] = [0; 4]; src.read_buf(&mut flags)?; - let mut edata: Vec = Vec::with_capacity(8); - edata.resize(8, 0); + let mut edata: Vec = vec![0; 8]; let p0 = &mut edata[0..4]; p0.copy_from_slice(&magic); let p1 = &mut edata[4..][..4]; @@ -99,7 +98,7 @@ impl<'a> DemuxCore<'a> for BinkDemuxer<'a> { } self.frame_pos = Vec::with_capacity(self.frames + 1); - for _ in 0..self.frames+1 { + for _ in 0..=self.frames { let pos = src.read_u32le()?; self.frame_pos.push(pos); } @@ -170,7 +169,7 @@ impl<'a> BinkDemuxer<'a> { pub struct BinkDemuxerCreator { } impl DemuxerCreator for BinkDemuxerCreator { - fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box + 'a> { + fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box + 'a> { Box::new(BinkDemuxer::new(br)) } fn get_name(&self) -> &'static str { "bink" }